From ba8294c0a1fc318ed4869bb63fd122c63881fff0 Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Fri, 28 Jun 2024 18:23:23 -0600 Subject: [PATCH] common: Move Intel generation-specific config from cpu to gpu These modules only included gpu configuration, so belong in that location. --- apple/macbook-air/4/default.nix | 2 +- apple/macbook-pro/14-1/default.nix | 2 +- asus/zenbook/ux371/default.nix | 2 +- common/{cpu => gpu}/intel/comet-lake/default.nix | 0 common/{cpu => gpu}/intel/elkhart-lake/default.nix | 0 common/{cpu => gpu}/intel/jasper-lake/default.nix | 0 common/{cpu => gpu}/intel/kaby-lake/default.nix | 0 common/{cpu => gpu}/intel/sandy-bridge/default.nix | 0 common/{cpu => gpu}/intel/tiger-lake/default.nix | 0 dell/inspiron/5509/default.nix | 2 +- dell/precision/7520/default.nix | 2 +- dell/xps/13-9360/default.nix | 2 +- dell/xps/13-9370/default.nix | 2 +- dell/xps/15-9560/default.nix | 2 +- dell/xps/15-9560/intel/default.nix | 2 +- dell/xps/15-9570/default.nix | 2 +- flake.nix | 6 +++--- google/pixelbook/default.nix | 2 +- gpd/p2-max/default.nix | 2 +- hardkernel/odroid-h3/default.nix | 2 +- hp/elitebook/2560p/default.nix | 2 +- hp/notebook/14-df0023/default.nix | 2 +- huawei/machc-wa/default.nix | 2 +- lenovo/thinkpad/e470/default.nix | 2 +- lenovo/thinkpad/l480/default.nix | 2 +- lenovo/thinkpad/p51/default.nix | 2 +- lenovo/thinkpad/t420/default.nix | 2 +- lenovo/thinkpad/t520/default.nix | 2 +- lenovo/thinkpad/w520/default.nix | 2 +- lenovo/thinkpad/x220/default.nix | 2 +- microsoft/surface/surface-go/default.nix | 2 +- protectli/vp4670/default.nix | 2 +- 32 files changed, 28 insertions(+), 28 deletions(-) rename common/{cpu => gpu}/intel/comet-lake/default.nix (100%) rename common/{cpu => gpu}/intel/elkhart-lake/default.nix (100%) rename common/{cpu => gpu}/intel/jasper-lake/default.nix (100%) rename common/{cpu => gpu}/intel/kaby-lake/default.nix (100%) rename common/{cpu => gpu}/intel/sandy-bridge/default.nix (100%) rename common/{cpu => gpu}/intel/tiger-lake/default.nix (100%) diff --git a/apple/macbook-air/4/default.nix b/apple/macbook-air/4/default.nix index 181a0997..850ad8de 100644 --- a/apple/macbook-air/4/default.nix +++ b/apple/macbook-air/4/default.nix @@ -3,7 +3,7 @@ { imports = [ ../. - ../../../common/cpu/intel/sandy-bridge + ../../../common/gpu/intel/sandy-bridge ]; boot.kernelParams = [ diff --git a/apple/macbook-pro/14-1/default.nix b/apple/macbook-pro/14-1/default.nix index 54a6e84d..c2b61f9e 100644 --- a/apple/macbook-pro/14-1/default.nix +++ b/apple/macbook-pro/14-1/default.nix @@ -5,7 +5,7 @@ ... }: { imports = [ - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/intel/kaby-lake ../../../common/gpu/intel ../../../common/hidpi.nix ../../../common/pc/laptop diff --git a/asus/zenbook/ux371/default.nix b/asus/zenbook/ux371/default.nix index 8601e2b2..4fcfb28d 100644 --- a/asus/zenbook/ux371/default.nix +++ b/asus/zenbook/ux371/default.nix @@ -7,7 +7,7 @@ }: { imports = [ - ../../../common/cpu/intel/tiger-lake + ../../../common/gpu/intel/tiger-lake ../../../common/pc/laptop ../../../common/pc/laptop/ssd ../../battery.nix diff --git a/common/cpu/intel/comet-lake/default.nix b/common/gpu/intel/comet-lake/default.nix similarity index 100% rename from common/cpu/intel/comet-lake/default.nix rename to common/gpu/intel/comet-lake/default.nix diff --git a/common/cpu/intel/elkhart-lake/default.nix b/common/gpu/intel/elkhart-lake/default.nix similarity index 100% rename from common/cpu/intel/elkhart-lake/default.nix rename to common/gpu/intel/elkhart-lake/default.nix diff --git a/common/cpu/intel/jasper-lake/default.nix b/common/gpu/intel/jasper-lake/default.nix similarity index 100% rename from common/cpu/intel/jasper-lake/default.nix rename to common/gpu/intel/jasper-lake/default.nix diff --git a/common/cpu/intel/kaby-lake/default.nix b/common/gpu/intel/kaby-lake/default.nix similarity index 100% rename from common/cpu/intel/kaby-lake/default.nix rename to common/gpu/intel/kaby-lake/default.nix diff --git a/common/cpu/intel/sandy-bridge/default.nix b/common/gpu/intel/sandy-bridge/default.nix similarity index 100% rename from common/cpu/intel/sandy-bridge/default.nix rename to common/gpu/intel/sandy-bridge/default.nix diff --git a/common/cpu/intel/tiger-lake/default.nix b/common/gpu/intel/tiger-lake/default.nix similarity index 100% rename from common/cpu/intel/tiger-lake/default.nix rename to common/gpu/intel/tiger-lake/default.nix diff --git a/dell/inspiron/5509/default.nix b/dell/inspiron/5509/default.nix index e77c9fd1..b199e92b 100644 --- a/dell/inspiron/5509/default.nix +++ b/dell/inspiron/5509/default.nix @@ -1,7 +1,7 @@ { lib, ... }: { imports = [ - ../../../common/cpu/intel/tiger-lake + ../../../common/gpu/intel/tiger-lake ../../../common/pc/laptop ../../../common/pc/ssd ]; diff --git a/dell/precision/7520/default.nix b/dell/precision/7520/default.nix index 59fa95e6..09f85927 100644 --- a/dell/precision/7520/default.nix +++ b/dell/precision/7520/default.nix @@ -4,7 +4,7 @@ ... }: { imports = [ - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/intel/kaby-lake ../../../common/pc/laptop ../../../common/pc/laptop/ssd ../../../common/gpu/nvidia diff --git a/dell/xps/13-9360/default.nix b/dell/xps/13-9360/default.nix index f1ea3787..5c73b8bb 100644 --- a/dell/xps/13-9360/default.nix +++ b/dell/xps/13-9360/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/intel/kaby-lake ../../../common/pc/laptop ]; diff --git a/dell/xps/13-9370/default.nix b/dell/xps/13-9370/default.nix index 10362b3b..62dddc55 100644 --- a/dell/xps/13-9370/default.nix +++ b/dell/xps/13-9370/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/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 49e36b16..aee5665f 100644 --- a/dell/xps/15-9560/default.nix +++ b/dell/xps/15-9560/default.nix @@ -1,7 +1,7 @@ { imports = [ ../../../common/cpu/intel - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/intel/kaby-lake ../../../common/pc/laptop ./xps-common.nix diff --git a/dell/xps/15-9560/intel/default.nix b/dell/xps/15-9560/intel/default.nix index 22de3bc8..a77cb82d 100644 --- a/dell/xps/15-9560/intel/default.nix +++ b/dell/xps/15-9560/intel/default.nix @@ -1,7 +1,7 @@ { imports = [ ../../../../common/cpu/intel - ../../../../common/cpu/intel/kaby-lake + ../../../../common/gpu/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 200dc093..9ef1a898 100644 --- a/dell/xps/15-9570/default.nix +++ b/dell/xps/15-9570/default.nix @@ -2,7 +2,7 @@ { imports = [ ../../../common/cpu/intel - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/intel/kaby-lake ../../../common/pc/laptop ./xps-common.nix ]; diff --git a/flake.nix b/flake.nix index 112e00e1..6072c4fe 100644 --- a/flake.nix +++ b/flake.nix @@ -266,10 +266,10 @@ common-cpu-amd-zenpower = import ./common/cpu/amd/zenpower.nix; common-cpu-amd-raphael-igpu = import ./common/cpu/amd/raphael/igpu.nix; common-cpu-intel = import ./common/cpu/intel; - common-cpu-intel-comet-lake = import ./common/cpu/intel/comet-lake; + common-gpu-intel-comet-lake = import ./common/gpu/intel/comet-lake; common-cpu-intel-cpu-only = import ./common/cpu/intel/cpu-only.nix; - common-cpu-intel-kaby-lake = import ./common/cpu/intel/kaby-lake; - common-cpu-intel-sandy-bridge = import ./common/cpu/intel/sandy-bridge; + common-gpu-intel-kaby-lake = import ./common/gpu/intel/kaby-lake; + common-gpu-intel-sandy-bridge = import ./common/gpu/intel/sandy-bridge; common-gpu-amd = import ./common/gpu/amd; common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands; common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands; diff --git a/google/pixelbook/default.nix b/google/pixelbook/default.nix index 1ea4c7af..0de52ed3 100644 --- a/google/pixelbook/default.nix +++ b/google/pixelbook/default.nix @@ -4,6 +4,6 @@ imports = [ ../../common/pc/laptop ../../common/pc/laptop/ssd - ../../common/cpu/intel/kaby-lake + ../../common/gpu/intel/kaby-lake ]; } diff --git a/gpd/p2-max/default.nix b/gpd/p2-max/default.nix index f3118644..2c02e178 100644 --- a/gpd/p2-max/default.nix +++ b/gpd/p2-max/default.nix @@ -3,7 +3,7 @@ ../../common/pc/laptop ../../common/pc/laptop/ssd ../../common/cpu/intel - ../../common/cpu/intel/kaby-lake + ../../common/gpu/intel/kaby-lake ../../common/hidpi.nix ]; } diff --git a/hardkernel/odroid-h3/default.nix b/hardkernel/odroid-h3/default.nix index e52d3a02..52d58195 100644 --- a/hardkernel/odroid-h3/default.nix +++ b/hardkernel/odroid-h3/default.nix @@ -1,5 +1,5 @@ { imports = [ - ../../common/cpu/intel/jasper-lake + ../../common/gpu/intel/jasper-lake ]; } diff --git a/hp/elitebook/2560p/default.nix b/hp/elitebook/2560p/default.nix index 3802337d..ddcc6c34 100644 --- a/hp/elitebook/2560p/default.nix +++ b/hp/elitebook/2560p/default.nix @@ -3,7 +3,7 @@ with lib; { imports = [ ../../../common/cpu/intel - ../../../common/cpu/intel/sandy-bridge + ../../../common/gpu/intel/sandy-bridge ../../../common/pc ../../../common/pc/laptop ../../../common/pc/laptop/hdd diff --git a/hp/notebook/14-df0023/default.nix b/hp/notebook/14-df0023/default.nix index ca6e30d4..b3cbfaeb 100644 --- a/hp/notebook/14-df0023/default.nix +++ b/hp/notebook/14-df0023/default.nix @@ -3,7 +3,7 @@ with lib; { imports = [ ../../../common/cpu/intel - ../../../common/cpu/intel/sandy-bridge + ../../../common/gpu/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 e2bc0a8a..d92a6a17 100644 --- a/huawei/machc-wa/default.nix +++ b/huawei/machc-wa/default.nix @@ -6,7 +6,7 @@ }: { imports = [ ../../common/cpu/intel - ../../common/cpu/intel/comet-lake + ../../common/gpu/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 32007321..55aa595a 100644 --- a/lenovo/thinkpad/e470/default.nix +++ b/lenovo/thinkpad/e470/default.nix @@ -3,7 +3,7 @@ { imports = [ ../. - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/intel/kaby-lake ../../../common/gpu/nvidia/prime.nix ]; diff --git a/lenovo/thinkpad/l480/default.nix b/lenovo/thinkpad/l480/default.nix index d000320d..2211c062 100644 --- a/lenovo/thinkpad/l480/default.nix +++ b/lenovo/thinkpad/l480/default.nix @@ -2,7 +2,7 @@ { imports = [ ../. - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/intel/kaby-lake ../../../common/pc/laptop/ssd ]; diff --git a/lenovo/thinkpad/p51/default.nix b/lenovo/thinkpad/p51/default.nix index 91289701..6bd162db 100644 --- a/lenovo/thinkpad/p51/default.nix +++ b/lenovo/thinkpad/p51/default.nix @@ -3,7 +3,7 @@ ../../../common/gpu/24.05-compat.nix ../../../common/gpu/nvidia/prime.nix ../../../common/cpu/intel - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/intel/kaby-lake ../../../common/pc/laptop/acpi_call.nix ../. ]; diff --git a/lenovo/thinkpad/t420/default.nix b/lenovo/thinkpad/t420/default.nix index a3c7db40..09f5d3fd 100644 --- a/lenovo/thinkpad/t420/default.nix +++ b/lenovo/thinkpad/t420/default.nix @@ -2,7 +2,7 @@ imports = [ ../. ../tp-smapi.nix - ../../../common/cpu/intel/sandy-bridge + ../../../common/gpu/intel/sandy-bridge ../../../common/pc/laptop/acpi_call.nix ]; } diff --git a/lenovo/thinkpad/t520/default.nix b/lenovo/thinkpad/t520/default.nix index a3c7db40..09f5d3fd 100644 --- a/lenovo/thinkpad/t520/default.nix +++ b/lenovo/thinkpad/t520/default.nix @@ -2,7 +2,7 @@ imports = [ ../. ../tp-smapi.nix - ../../../common/cpu/intel/sandy-bridge + ../../../common/gpu/intel/sandy-bridge ../../../common/pc/laptop/acpi_call.nix ]; } diff --git a/lenovo/thinkpad/w520/default.nix b/lenovo/thinkpad/w520/default.nix index a3c7db40..09f5d3fd 100644 --- a/lenovo/thinkpad/w520/default.nix +++ b/lenovo/thinkpad/w520/default.nix @@ -2,7 +2,7 @@ imports = [ ../. ../tp-smapi.nix - ../../../common/cpu/intel/sandy-bridge + ../../../common/gpu/intel/sandy-bridge ../../../common/pc/laptop/acpi_call.nix ]; } diff --git a/lenovo/thinkpad/x220/default.nix b/lenovo/thinkpad/x220/default.nix index ec8b45c9..c63333b2 100644 --- a/lenovo/thinkpad/x220/default.nix +++ b/lenovo/thinkpad/x220/default.nix @@ -1,7 +1,7 @@ { imports = [ ../. - ../../../common/cpu/intel/sandy-bridge + ../../../common/gpu/intel/sandy-bridge ../../../common/pc/laptop/hdd # TODO: reverse compat ../tp-smapi.nix ]; diff --git a/microsoft/surface/surface-go/default.nix b/microsoft/surface/surface-go/default.nix index fdd13f6c..017cd718 100644 --- a/microsoft/surface/surface-go/default.nix +++ b/microsoft/surface/surface-go/default.nix @@ -14,7 +14,7 @@ in { ../../../common/pc/ssd # The Intel CPU module auto-includes Intel's GPU: ../../../common/cpu/intel - ../../../common/cpu/intel/kaby-lake + ../../../common/gpu/intel/kaby-lake ]; boot.kernelParams = [ diff --git a/protectli/vp4670/default.nix b/protectli/vp4670/default.nix index fdaac857..14dcf4ce 100644 --- a/protectli/vp4670/default.nix +++ b/protectli/vp4670/default.nix @@ -1,6 +1,6 @@ { imports = [ - ../../common/cpu/intel/comet-lake + ../../common/gpu/intel/comet-lake ]; boot.initrd.kernelModules = [