common: Move Intel generation-specific config from cpu to gpu

These modules only included gpu configuration, so belong in that
location.
This commit is contained in:
Lyndon Sanche 2024-06-28 18:23:23 -06:00 committed by mergify[bot]
parent 72d3c00702
commit ba8294c0a1
32 changed files with 28 additions and 28 deletions

View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../. ../.
../../../common/cpu/intel/sandy-bridge ../../../common/gpu/intel/sandy-bridge
]; ];
boot.kernelParams = [ boot.kernelParams = [

View file

@ -5,7 +5,7 @@
... ...
}: { }: {
imports = [ imports = [
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
../../../common/gpu/intel ../../../common/gpu/intel
../../../common/hidpi.nix ../../../common/hidpi.nix
../../../common/pc/laptop ../../../common/pc/laptop

View file

@ -7,7 +7,7 @@
}: }:
{ {
imports = [ imports = [
../../../common/cpu/intel/tiger-lake ../../../common/gpu/intel/tiger-lake
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
../../battery.nix ../../battery.nix

View file

@ -1,7 +1,7 @@
{ lib, ... }: { lib, ... }:
{ {
imports = [ imports = [
../../../common/cpu/intel/tiger-lake ../../../common/gpu/intel/tiger-lake
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/ssd ../../../common/pc/ssd
]; ];

View file

@ -4,7 +4,7 @@
... ...
}: { }: {
imports = [ imports = [
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
../../../common/gpu/nvidia ../../../common/gpu/nvidia

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop ../../../common/pc/laptop
]; ];

View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
]; ];

View file

@ -1,7 +1,7 @@
{ {
imports = [ imports = [
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop ../../../common/pc/laptop
./xps-common.nix ./xps-common.nix

View file

@ -1,7 +1,7 @@
{ {
imports = [ imports = [
../../../../common/cpu/intel ../../../../common/cpu/intel
../../../../common/cpu/intel/kaby-lake ../../../../common/gpu/intel/kaby-lake
../../../../common/pc/laptop ../../../../common/pc/laptop
../../../../common/gpu/nvidia/disable.nix ../../../../common/gpu/nvidia/disable.nix
../xps-common.nix ../xps-common.nix

View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop ../../../common/pc/laptop
./xps-common.nix ./xps-common.nix
]; ];

View file

@ -266,10 +266,10 @@
common-cpu-amd-zenpower = import ./common/cpu/amd/zenpower.nix; common-cpu-amd-zenpower = import ./common/cpu/amd/zenpower.nix;
common-cpu-amd-raphael-igpu = import ./common/cpu/amd/raphael/igpu.nix; common-cpu-amd-raphael-igpu = import ./common/cpu/amd/raphael/igpu.nix;
common-cpu-intel = import ./common/cpu/intel; 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-cpu-only = import ./common/cpu/intel/cpu-only.nix;
common-cpu-intel-kaby-lake = import ./common/cpu/intel/kaby-lake; common-gpu-intel-kaby-lake = import ./common/gpu/intel/kaby-lake;
common-cpu-intel-sandy-bridge = import ./common/cpu/intel/sandy-bridge; common-gpu-intel-sandy-bridge = import ./common/gpu/intel/sandy-bridge;
common-gpu-amd = import ./common/gpu/amd; common-gpu-amd = import ./common/gpu/amd;
common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands; common-gpu-amd-sea-islands = import ./common/gpu/amd/sea-islands;
common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands; common-gpu-amd-southern-islands = import ./common/gpu/amd/southern-islands;

View file

@ -4,6 +4,6 @@
imports = [ imports = [
../../common/pc/laptop ../../common/pc/laptop
../../common/pc/laptop/ssd ../../common/pc/laptop/ssd
../../common/cpu/intel/kaby-lake ../../common/gpu/intel/kaby-lake
]; ];
} }

View file

@ -3,7 +3,7 @@
../../common/pc/laptop ../../common/pc/laptop
../../common/pc/laptop/ssd ../../common/pc/laptop/ssd
../../common/cpu/intel ../../common/cpu/intel
../../common/cpu/intel/kaby-lake ../../common/gpu/intel/kaby-lake
../../common/hidpi.nix ../../common/hidpi.nix
]; ];
} }

View file

@ -1,5 +1,5 @@
{ {
imports = [ imports = [
../../common/cpu/intel/jasper-lake ../../common/gpu/intel/jasper-lake
]; ];
} }

View file

@ -3,7 +3,7 @@ with lib;
{ {
imports = [ imports = [
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/cpu/intel/sandy-bridge ../../../common/gpu/intel/sandy-bridge
../../../common/pc ../../../common/pc
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/hdd ../../../common/pc/laptop/hdd

View file

@ -3,7 +3,7 @@ with lib;
{ {
imports = [ imports = [
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/cpu/intel/sandy-bridge ../../../common/gpu/intel/sandy-bridge
../../../common/pc ../../../common/pc
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/hdd ../../../common/pc/laptop/hdd

View file

@ -6,7 +6,7 @@
}: { }: {
imports = [ imports = [
../../common/cpu/intel ../../common/cpu/intel
../../common/cpu/intel/comet-lake ../../common/gpu/intel/comet-lake
../../common/gpu/nvidia ../../common/gpu/nvidia
../../common/gpu/nvidia/prime.nix ../../common/gpu/nvidia/prime.nix
../../common/hidpi.nix ../../common/hidpi.nix

View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../. ../.
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
../../../common/gpu/nvidia/prime.nix ../../../common/gpu/nvidia/prime.nix
]; ];

View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../. ../.
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];

View file

@ -3,7 +3,7 @@
../../../common/gpu/24.05-compat.nix ../../../common/gpu/24.05-compat.nix
../../../common/gpu/nvidia/prime.nix ../../../common/gpu/nvidia/prime.nix
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
../. ../.
]; ];

View file

@ -2,7 +2,7 @@
imports = [ imports = [
../. ../.
../tp-smapi.nix ../tp-smapi.nix
../../../common/cpu/intel/sandy-bridge ../../../common/gpu/intel/sandy-bridge
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
]; ];
} }

View file

@ -2,7 +2,7 @@
imports = [ imports = [
../. ../.
../tp-smapi.nix ../tp-smapi.nix
../../../common/cpu/intel/sandy-bridge ../../../common/gpu/intel/sandy-bridge
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
]; ];
} }

View file

@ -2,7 +2,7 @@
imports = [ imports = [
../. ../.
../tp-smapi.nix ../tp-smapi.nix
../../../common/cpu/intel/sandy-bridge ../../../common/gpu/intel/sandy-bridge
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
]; ];
} }

View file

@ -1,7 +1,7 @@
{ {
imports = [ imports = [
../. ../.
../../../common/cpu/intel/sandy-bridge ../../../common/gpu/intel/sandy-bridge
../../../common/pc/laptop/hdd # TODO: reverse compat ../../../common/pc/laptop/hdd # TODO: reverse compat
../tp-smapi.nix ../tp-smapi.nix
]; ];

View file

@ -14,7 +14,7 @@ in {
../../../common/pc/ssd ../../../common/pc/ssd
# The Intel CPU module auto-includes Intel's GPU: # The Intel CPU module auto-includes Intel's GPU:
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/cpu/intel/kaby-lake ../../../common/gpu/intel/kaby-lake
]; ];
boot.kernelParams = [ boot.kernelParams = [

View file

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
../../common/cpu/intel/comet-lake ../../common/gpu/intel/comet-lake
]; ];
boot.initrd.kernelModules = [ boot.initrd.kernelModules = [