Skip to content

Commit 7495e87

Browse files
Pandapip1mergify[bot]
Pandapip1
authored and
mergify[bot]
committed
treewide: Switch from gpu/intel to cpu/intel where applicable
1 parent c058019 commit 7495e87

File tree

35 files changed

+32
-51
lines changed

35 files changed

+32
-51
lines changed

‎apple/imac/14-2/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
imports = [
99
../.
10-
../../../common/gpu/intel
10+
../../../common/cpu/intel
1111
../../../common/gpu/nvidia
1212
../../../common/gpu/nvidia/kepler
1313
../../../common/hidpi.nix

‎apple/imac/18-2/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
}: {
77
imports = [
88
../.
9-
../../../common/gpu/intel/kaby-lake
10-
../../../common/gpu/intel
9+
../../../common/cpu/intel/kaby-lake
1110
../../../common/gpu/amd
1211
../../../common/hidpi.nix
1312
../../../common/pc/laptop/ssd

‎apple/macbook-air/3/default.nix

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
{
44
imports = [
55
../../.
6+
../../../common/cpu/intel
67
../../../common/pc/laptop
78
../../../common/pc/ssd
89
];
910

1011
# Built-in iSight is recognized by the generic uvcvideo kernel module
1112
hardware.facetimehd.enable = false;
12-
13-
hardware.cpu.intel.updateMicrocode =
14-
lib.mkDefault config.hardware.enableRedistributableFirmware;
1513
}

‎apple/macbook-air/4/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
imports = [
55
../.
6-
../../../common/gpu/intel/sandy-bridge
6+
../../../common/cpu/intel/sandy-bridge
77
];
88

99
boot.kernelParams = [

‎apple/macbook-pro/14-1/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
}: {
77
imports = [
88
../.
9-
../../../common/gpu/intel/kaby-lake
10-
../../../common/gpu/intel
9+
../../../common/cpu/intel/kaby-lake
1110
../../../common/hidpi.nix
1211
../../../common/pc/laptop/ssd
1312
../../../common/pc/laptop/acpi_call.nix

‎apple/macbook-pro/8-1/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
imports = [
55
../.
6-
../../../common/gpu/intel/sandy-bridge
6+
../../../common/cpu/intel/sandy-bridge
77
../../../common/pc/laptop/ssd
88
];
99

‎asus/zenbook/ux371/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
}:
66
{
77
imports = [
8-
../../../common/gpu/intel/tiger-lake
8+
../../../common/cpu/intel/tiger-lake
99
../../../common/pc/laptop
1010
../../../common/pc/laptop/ssd
1111
../../battery.nix

‎dell/inspiron/5509/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ lib, ... }:
22
{
33
imports = [
4-
../../../common/gpu/intel/tiger-lake
4+
../../../common/cpu/intel/tiger-lake
55
../../../common/pc/laptop
66
../../../common/pc/ssd
77
];

‎dell/precision/5560/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
imports = [
44
../../../common/pc/laptop
55
../../../common/pc/laptop/ssd
6-
../../../common/cpu/intel
7-
../../../common/gpu/intel/tiger-lake
6+
../../../common/cpu/intel/tiger-lake
87
../../../common/gpu/nvidia/turing
98
];
109

‎dell/precision/7520/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
...
55
}: {
66
imports = [
7-
../../../common/gpu/intel/kaby-lake
7+
../../../common/cpu/intel/kaby-lake
88
../../../common/pc/laptop
99
../../../common/pc/laptop/ssd
1010
../../../common/gpu/nvidia

‎dell/xps/13-9300/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ let
66
in {
77
imports = [
88
../../../common/cpu/intel
9-
../../../common/gpu/intel
109
../../../common/pc/laptop
1110
../../../common/pc/laptop/acpi_call.nix
1211
../../../common/pc/ssd

‎dell/xps/13-9360/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
imports = [
3-
../../../common/gpu/intel/kaby-lake
3+
../../../common/cpu/intel/kaby-lake
44
../../../common/pc/laptop
55
];
66

‎dell/xps/13-9370/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{
44
imports = [
5-
../../../common/gpu/intel/kaby-lake
5+
../../../common/cpu/intel/kaby-lake
66
../../../common/pc/laptop
77
../../../common/pc/laptop/acpi_call.nix
88
];

‎dell/xps/15-9560/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
imports = [
3-
../../../common/cpu/intel
4-
../../../common/gpu/intel/kaby-lake
3+
../../../common/cpu/intel/kaby-lake
54
../../../common/pc/laptop
65
./xps-common.nix
76
../../../common/gpu/nvidia

‎dell/xps/15-9560/intel/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
imports = [
3-
../../../../common/cpu/intel
4-
../../../../common/gpu/intel/kaby-lake
3+
../../../../common/cpu/intel/kaby-lake
54
../../../../common/pc/laptop
65
../../../../common/gpu/nvidia/disable.nix
76
../xps-common.nix

‎dell/xps/15-9570/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{ lib, ... }:
22
{
33
imports = [
4-
../../../common/cpu/intel
5-
../../../common/gpu/intel/kaby-lake
4+
../../../common/cpu/intel/kaby-lake
65
../../../common/pc/laptop
76
./xps-common.nix
87
];

‎google/pixelbook/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
imports = [
55
../../common/pc/laptop
66
../../common/pc/laptop/ssd
7-
../../common/gpu/intel/kaby-lake
7+
../../common/cpu/intel/kaby-lake
88
];
99
}

‎gpd/p2-max/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
imports = [
33
../../common/pc/laptop
44
../../common/pc/laptop/ssd
5-
../../common/cpu/intel
6-
../../common/gpu/intel/kaby-lake
5+
../../common/cpu/intel/kaby-lake
76
../../common/hidpi.nix
87
];
98
}

‎hardkernel/odroid-h3/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
imports = [
3-
../../common/gpu/intel/jasper-lake
3+
../../common/cpu/intel/jasper-lake
44
];
55
}

‎hp/elitebook/2560p/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
with lib;
33
{
44
imports = [
5-
../../../common/cpu/intel
6-
../../../common/gpu/intel/sandy-bridge
5+
../../../common/cpu/intel/sandy-bridge
76
../../../common/pc
87
../../../common/pc/laptop
98
../../../common/pc/laptop/hdd

‎hp/laptop/14s-dq2024nf/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
{
44
imports = [
5-
../../../common/cpu/intel
6-
../../../common/gpu/intel/tiger-lake
5+
../../../common/cpu/intel/tiger-lake
76
../../../common/pc
87
../../../common/pc/laptop
98
../../../common/pc/laptop/ssd

‎hp/notebook/14-df0023/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
with lib;
33
{
44
imports = [
5-
../../../common/cpu/intel
6-
../../../common/gpu/intel/sandy-bridge
5+
../../../common/cpu/intel/sandy-bridge
76
../../../common/pc
87
../../../common/pc/laptop
98
../../../common/pc/laptop/hdd

‎huawei/machc-wa/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
...
66
}: {
77
imports = [
8-
../../common/cpu/intel
9-
../../common/gpu/intel/comet-lake
8+
../../common/cpu/intel/comet-lake
109
../../common/gpu/nvidia
1110
../../common/gpu/nvidia/prime.nix
1211
../../common/hidpi.nix

‎lenovo/thinkpad/e470/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
imports = [
55
../.
6-
../../../common/gpu/intel/kaby-lake
6+
../../../common/cpu/intel/kaby-lake
77
../../../common/gpu/nvidia/prime.nix
88
../../../common/gpu/nvidia/maxwell
99
];

‎lenovo/thinkpad/l480/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
imports = [
44
../.
5-
../../../common/gpu/intel/kaby-lake
5+
../../../common/cpu/intel/kaby-lake
66
../../../common/pc/laptop/ssd
77
];
88

‎lenovo/thinkpad/p51/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
../../../common/gpu/24.05-compat.nix
44
../../../common/gpu/nvidia/prime.nix
55
../../../common/gpu/nvidia/maxwell
6-
../../../common/cpu/intel
7-
../../../common/gpu/intel/kaby-lake
6+
../../../common/cpu/intel/kaby-lake
87
../../../common/pc/laptop/acpi_call.nix
98
../.
109
];

‎lenovo/thinkpad/t420/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
imports = [
33
../.
44
../tp-smapi.nix
5-
../../../common/gpu/intel/sandy-bridge
5+
../../../common/cpu/intel/sandy-bridge
66
../../../common/pc/laptop/acpi_call.nix
77
];
88
}

‎lenovo/thinkpad/t480s/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
imports = [
55
../../../common/cpu/intel
6-
../../../common/gpu/intel
76
../../../common/pc/laptop/acpi_call.nix
87
../../../common/pc/ssd
98
../.

‎lenovo/thinkpad/t520/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
imports = [
33
../.
44
../tp-smapi.nix
5-
../../../common/gpu/intel/sandy-bridge
5+
../../../common/cpu/intel/sandy-bridge
66
../../../common/pc/laptop/acpi_call.nix
77
];
88
}

‎lenovo/thinkpad/w520/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
imports = [
33
../.
44
../tp-smapi.nix
5-
../../../common/gpu/intel/sandy-bridge
5+
../../../common/cpu/intel/sandy-bridge
66
../../../common/pc/laptop/acpi_call.nix
77
];
88
}

‎lenovo/thinkpad/x220/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
imports = [
33
../.
4-
../../../common/gpu/intel/sandy-bridge
4+
../../../common/cpu/intel/sandy-bridge
55
../../../common/pc/laptop/hdd # TODO: reverse compat
66
../tp-smapi.nix
77
];

‎malibal/aon/s1/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
../../../common/cpu/intel
99

10-
../../../common/gpu/intel
1110
../../../common/gpu/nvidia/disable.nix
1211
];
1312

‎microsoft/surface/surface-go/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ in {
1313
../../../common/pc
1414
../../../common/pc/ssd
1515
# The Intel CPU module auto-includes Intel's GPU:
16-
../../../common/cpu/intel
17-
../../../common/gpu/intel/kaby-lake
16+
../../../common/cpu/intel/kaby-lake
1817
];
1918

2019
boot.kernelParams = [

‎msi/gl65/10SDR-492/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
{
44
imports = [
55
../../../common/pc/laptop/ssd
6-
../../../common/cpu/intel
7-
../../../common/gpu/intel/comet-lake
6+
../../../common/cpu/intel/comet-lake
87
../../../common/gpu/nvidia/prime.nix
98
../../../common/gpu/nvidia/turing
109
../../../common/pc/laptop

‎protectli/vp4670/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
imports = [
3-
../../common/gpu/intel/comet-lake
3+
../../common/cpu/intel/comet-lake
44
];
55

66
boot.initrd.kernelModules = [

0 commit comments

Comments
 (0)