treewide: Switch from gpu/intel to cpu/intel where applicable

Pandapip1 · mergify[bot] · commit 7495e8775399 · 2024-10-21T09:00:57.000Z
diff --git a/apple/imac/14-2/default.nix b/apple/imac/14-2/default.nix
@@ -7,7 +7,7 @@
 {
   imports = [
     ../.
-    ../../../common/gpu/intel
+    ../../../common/cpu/intel
     ../../../common/gpu/nvidia
     ../../../common/gpu/nvidia/kepler
     ../../../common/hidpi.nix
diff --git a/apple/imac/18-2/default.nix b/apple/imac/18-2/default.nix
@@ -6,8 +6,7 @@
 }: {
   imports = [
     ../.
-    ../../../common/gpu/intel/kaby-lake
-    ../../../common/gpu/intel
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/gpu/amd
     ../../../common/hidpi.nix
     ../../../common/pc/laptop/ssd
diff --git a/apple/macbook-air/3/default.nix b/apple/macbook-air/3/default.nix
@@ -3,13 +3,11 @@
 {
   imports = [ 
     ../../.
+    ../../../common/cpu/intel
     ../../../common/pc/laptop
     ../../../common/pc/ssd
   ];
 
   # Built-in iSight is recognized by the generic uvcvideo kernel module
   hardware.facetimehd.enable = false;
-
-  hardware.cpu.intel.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/apple/macbook-air/4/default.nix b/apple/macbook-air/4/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../common/gpu/intel/sandy-bridge
+    ../../../common/cpu/intel/sandy-bridge
   ];
 
   boot.kernelParams = [
diff --git a/apple/macbook-pro/14-1/default.nix b/apple/macbook-pro/14-1/default.nix
@@ -6,8 +6,7 @@
 }: {
   imports = [
     ../.
-    ../../../common/gpu/intel/kaby-lake
-    ../../../common/gpu/intel
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/hidpi.nix
     ../../../common/pc/laptop/ssd
     ../../../common/pc/laptop/acpi_call.nix
diff --git a/apple/macbook-pro/8-1/default.nix b/apple/macbook-pro/8-1/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../common/gpu/intel/sandy-bridge
+    ../../../common/cpu/intel/sandy-bridge
     ../../../common/pc/laptop/ssd
   ];
 
diff --git a/asus/zenbook/ux371/default.nix b/asus/zenbook/ux371/default.nix
@@ -5,7 +5,7 @@
 }:
 {
   imports = [
-    ../../../common/gpu/intel/tiger-lake
+    ../../../common/cpu/intel/tiger-lake
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
     ../../battery.nix
diff --git a/dell/inspiron/5509/default.nix b/dell/inspiron/5509/default.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 {
   imports = [
-    ../../../common/gpu/intel/tiger-lake
+    ../../../common/cpu/intel/tiger-lake
     ../../../common/pc/laptop
     ../../../common/pc/ssd
   ];
diff --git a/dell/precision/5560/default.nix b/dell/precision/5560/default.nix
@@ -3,8 +3,7 @@
   imports = [
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel/tiger-lake
+    ../../../common/cpu/intel/tiger-lake
     ../../../common/gpu/nvidia/turing
   ];
 
diff --git a/dell/precision/7520/default.nix b/dell/precision/7520/default.nix
@@ -4,7 +4,7 @@
   ...
 }: {
   imports = [
-    ../../../common/gpu/intel/kaby-lake
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
     ../../../common/gpu/nvidia
diff --git a/dell/xps/13-9300/default.nix b/dell/xps/13-9300/default.nix
@@ -6,7 +6,6 @@ let
 in {
   imports = [
     ../../../common/cpu/intel
-    ../../../common/gpu/intel
     ../../../common/pc/laptop
     ../../../common/pc/laptop/acpi_call.nix
     ../../../common/pc/ssd
diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../../../common/gpu/intel/kaby-lake
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop
   ];
 
diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../../../common/gpu/intel/kaby-lake
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop
     ../../../common/pc/laptop/acpi_call.nix
   ];
diff --git a/dell/xps/15-9560/default.nix b/dell/xps/15-9560/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel/kaby-lake
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop
     ./xps-common.nix
     ../../../common/gpu/nvidia
diff --git a/dell/xps/15-9560/intel/default.nix b/dell/xps/15-9560/intel/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
-    ../../../../common/cpu/intel
-    ../../../../common/gpu/intel/kaby-lake
+    ../../../../common/cpu/intel/kaby-lake
     ../../../../common/pc/laptop
     ../../../../common/gpu/nvidia/disable.nix
     ../xps-common.nix
diff --git a/dell/xps/15-9570/default.nix b/dell/xps/15-9570/default.nix
@@ -1,8 +1,7 @@
 { lib, ... }:
 {
   imports = [
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel/kaby-lake
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop
     ./xps-common.nix
   ];
diff --git a/google/pixelbook/default.nix b/google/pixelbook/default.nix
@@ -4,6 +4,6 @@
   imports = [
     ../../common/pc/laptop
     ../../common/pc/laptop/ssd
-    ../../common/gpu/intel/kaby-lake
+    ../../common/cpu/intel/kaby-lake
   ];
 }
diff --git a/gpd/p2-max/default.nix b/gpd/p2-max/default.nix
@@ -2,8 +2,7 @@
   imports = [
     ../../common/pc/laptop
     ../../common/pc/laptop/ssd
-    ../../common/cpu/intel
-    ../../common/gpu/intel/kaby-lake
+    ../../common/cpu/intel/kaby-lake
     ../../common/hidpi.nix
   ];
 }
diff --git a/hardkernel/odroid-h3/default.nix b/hardkernel/odroid-h3/default.nix
@@ -1,5 +1,5 @@
 {
   imports = [
-    ../../common/gpu/intel/jasper-lake
+    ../../common/cpu/intel/jasper-lake
   ];
 }
diff --git a/hp/elitebook/2560p/default.nix b/hp/elitebook/2560p/default.nix
@@ -2,8 +2,7 @@
 with lib;
 {
   imports = [
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel/sandy-bridge
+    ../../../common/cpu/intel/sandy-bridge
     ../../../common/pc
     ../../../common/pc/laptop
     ../../../common/pc/laptop/hdd
diff --git a/hp/laptop/14s-dq2024nf/default.nix b/hp/laptop/14s-dq2024nf/default.nix
@@ -2,8 +2,7 @@
 
 {
   imports = [
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel/tiger-lake
+    ../../../common/cpu/intel/tiger-lake
     ../../../common/pc
     ../../../common/pc/laptop
     ../../../common/pc/laptop/ssd
diff --git a/hp/notebook/14-df0023/default.nix b/hp/notebook/14-df0023/default.nix
@@ -2,8 +2,7 @@
 with lib;
 {
   imports = [
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel/sandy-bridge
+    ../../../common/cpu/intel/sandy-bridge
     ../../../common/pc
     ../../../common/pc/laptop
     ../../../common/pc/laptop/hdd
diff --git a/huawei/machc-wa/default.nix b/huawei/machc-wa/default.nix
@@ -5,8 +5,7 @@
   ...
 }: {
   imports = [
-    ../../common/cpu/intel
-    ../../common/gpu/intel/comet-lake
+    ../../common/cpu/intel/comet-lake
     ../../common/gpu/nvidia
     ../../common/gpu/nvidia/prime.nix
     ../../common/hidpi.nix
diff --git a/lenovo/thinkpad/e470/default.nix b/lenovo/thinkpad/e470/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../.
-    ../../../common/gpu/intel/kaby-lake
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/maxwell
   ];
diff --git a/lenovo/thinkpad/l480/default.nix b/lenovo/thinkpad/l480/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../.
-    ../../../common/gpu/intel/kaby-lake
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop/ssd
   ];
 
diff --git a/lenovo/thinkpad/p51/default.nix b/lenovo/thinkpad/p51/default.nix
@@ -3,8 +3,7 @@
     ../../../common/gpu/24.05-compat.nix
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/maxwell
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel/kaby-lake
+    ../../../common/cpu/intel/kaby-lake
     ../../../common/pc/laptop/acpi_call.nix
     ../.
   ];
diff --git a/lenovo/thinkpad/t420/default.nix b/lenovo/thinkpad/t420/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../.
     ../tp-smapi.nix
-    ../../../common/gpu/intel/sandy-bridge
+    ../../../common/cpu/intel/sandy-bridge
     ../../../common/pc/laptop/acpi_call.nix
   ];
 }
diff --git a/lenovo/thinkpad/t480s/default.nix b/lenovo/thinkpad/t480s/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ../../../common/cpu/intel
-    ../../../common/gpu/intel
     ../../../common/pc/laptop/acpi_call.nix
     ../../../common/pc/ssd
     ../.
diff --git a/lenovo/thinkpad/t520/default.nix b/lenovo/thinkpad/t520/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../.
     ../tp-smapi.nix
-    ../../../common/gpu/intel/sandy-bridge
+    ../../../common/cpu/intel/sandy-bridge
     ../../../common/pc/laptop/acpi_call.nix
   ];
 }
diff --git a/lenovo/thinkpad/w520/default.nix b/lenovo/thinkpad/w520/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ../.
     ../tp-smapi.nix
-    ../../../common/gpu/intel/sandy-bridge
+    ../../../common/cpu/intel/sandy-bridge
     ../../../common/pc/laptop/acpi_call.nix
   ];
 }
diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ../.
-    ../../../common/gpu/intel/sandy-bridge
+    ../../../common/cpu/intel/sandy-bridge
     ../../../common/pc/laptop/hdd # TODO: reverse compat
     ../tp-smapi.nix
   ];
diff --git a/malibal/aon/s1/default.nix b/malibal/aon/s1/default.nix
@@ -7,7 +7,6 @@
 
     ../../../common/cpu/intel
 
-    ../../../common/gpu/intel
     ../../../common/gpu/nvidia/disable.nix
   ];
 
diff --git a/microsoft/surface/surface-go/default.nix b/microsoft/surface/surface-go/default.nix
@@ -13,8 +13,7 @@ in {
     ../../../common/pc
     ../../../common/pc/ssd
     # The Intel CPU module auto-includes Intel's GPU:
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel/kaby-lake
+    ../../../common/cpu/intel/kaby-lake
   ];
 
   boot.kernelParams = [
diff --git a/msi/gl65/10SDR-492/default.nix b/msi/gl65/10SDR-492/default.nix
@@ -3,8 +3,7 @@
 {
   imports = [
     ../../../common/pc/laptop/ssd
-    ../../../common/cpu/intel
-    ../../../common/gpu/intel/comet-lake
+    ../../../common/cpu/intel/comet-lake
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/turing
     ../../../common/pc/laptop
diff --git a/protectli/vp4670/default.nix b/protectli/vp4670/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../../common/gpu/intel/comet-lake
+    ../../common/cpu/intel/comet-lake
   ];
 
   boot.initrd.kernelModules = [

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`{`
`8`	`8`	`imports = [`
`9`	`9`	`../.`
`10`		`- ../../../common/gpu/intel`
	`10`	`+ ../../../common/cpu/intel`
`11`	`11`	`../../../common/gpu/nvidia`
`12`	`12`	`../../../common/gpu/nvidia/kepler`
`13`	`13`	`../../../common/hidpi.nix`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,11 @@`
`3`	`3`	`{`
`4`	`4`	`imports = [`
`5`	`5`	`../../.`
	`6`	`+ ../../../common/cpu/intel`
`6`	`7`	`../../../common/pc/laptop`
`7`	`8`	`../../../common/pc/ssd`
`8`	`9`	`];`
`9`	`10`
`10`	`11`	`# Built-in iSight is recognized by the generic uvcvideo kernel module`
`11`	`12`	`hardware.facetimehd.enable = false;`
`12`		`-`
`13`		`- hardware.cpu.intel.updateMicrocode =`
`14`		`- lib.mkDefault config.hardware.enableRedistributableFirmware;`
`15`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`imports = [`
`5`	`5`	`../.`
`6`		`- ../../../common/gpu/intel/sandy-bridge`
	`6`	`+ ../../../common/cpu/intel/sandy-bridge`
`7`	`7`	`];`
`8`	`8`
`9`	`9`	`boot.kernelParams = [`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`}:`
`6`	`6`	`{`
`7`	`7`	`imports = [`
`8`		`- ../../../common/gpu/intel/tiger-lake`
	`8`	`+ ../../../common/cpu/intel/tiger-lake`
`9`	`9`	`../../../common/pc/laptop`
`10`	`10`	`../../../common/pc/laptop/ssd`
`11`	`11`	`../../battery.nix`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{ lib, ... }:`
`2`	`2`	`{`
`3`	`3`	`imports = [`
`4`		`- ../../../common/gpu/intel/tiger-lake`
	`4`	`+ ../../../common/cpu/intel/tiger-lake`
`5`	`5`	`../../../common/pc/laptop`
`6`	`6`	`../../../common/pc/ssd`
`7`	`7`	`];`