diff --git a/apple/imac/14-2/default.nix b/apple/imac/14-2/default.nix index c64f96719..c20acfd7f 100644 --- 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 index f44a8fc03..07608239c 100644 --- 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 index 03221edcd..9589e762a 100644 --- 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 index 850ad8def..181a09979 100644 --- 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 index 02c8542fb..e2fb2abee 100644 --- 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 index b849c69a5..bc77ea6ad 100644 --- 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 index 2ea562944..8e387c0cf 100644 --- 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 index b199e92b6..e77c9fd1e 100644 --- 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 index 6b6e3a0b7..f2e3d90a0 100644 --- 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 index 09f859270..59fa95e64 100644 --- 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 index 101165ee5..3ddd0ccf0 100644 --- 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 index 5c73b8bb2..f1ea37873 100644 --- 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 index 62dddc55a..10362b3b8 100644 --- 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 index 84c300a8d..bae517d88 100644 --- 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 index a77cb82d5..6d095f5dd 100644 --- 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 index 9ef1a8980..91fd02444 100644 --- 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 index 0de52ed38..1ea4c7afd 100644 --- 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 index 2c02e178d..e8f183e25 100644 --- 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 index 52d58195f..e52d3a02b 100644 --- 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 index ddcc6c342..9eb33043b 100644 --- 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 index 08a48b353..a1dea38d8 100644 --- 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 index b3cbfaeb7..edff7ea46 100644 --- 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 index d92a6a17f..9e3259d8d 100644 --- 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 index e963e12b7..6f18b5365 100644 --- 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 index 2211c0621..d000320d8 100644 --- 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 index 12de3ca3a..43c9b8dc9 100644 --- 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 index 09f5d3fd7..a3c7db40e 100644 --- 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 index f544ad3f0..bfca9122a 100644 --- 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 index 09f5d3fd7..a3c7db40e 100644 --- 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 index 09f5d3fd7..a3c7db40e 100644 --- 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 index c63333b23..ec8b45c94 100644 --- 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 index b86577a48..86995beb7 100644 --- 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 index 017cd7185..a86f741d7 100644 --- 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 index 3e825d4bd..75289d4b4 100644 --- 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 index 14dcf4ce8..fdaac8577 100644 --- 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 = [