Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jul 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46b2b3e
common: Move Intel generation-specific config from cpu to gpu
Lyndeno Jun 29, 2024
e753363
flake: Deprecate Intel generation-specific outputs
Lyndeno Jul 1, 2024
427e17f
Merge branch 'master' into intel_gpu_move
mergify[bot] Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apple/macbook-air/4/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
imports = [
../.
../../../common/cpu/intel/sandy-bridge
../../../common/gpu/intel/sandy-bridge
Lyndeno marked this conversation as resolved.
Show resolved Hide resolved
];

boot.kernelParams = [
Expand Down
2 changes: 1 addition & 1 deletion apple/macbook-pro/14-1/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
...
}: {
imports = [
../../../common/cpu/intel/kaby-lake
../../../common/gpu/intel/kaby-lake
../../../common/gpu/intel
../../../common/hidpi.nix
../../../common/pc/laptop
Expand Down
2 changes: 1 addition & 1 deletion asus/zenbook/ux371/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}:
{
imports = [
../../../common/cpu/intel/tiger-lake
../../../common/gpu/intel/tiger-lake
../../../common/pc/laptop
../../../common/pc/laptop/ssd
../../battery.nix
Expand Down
0 common/cpu/intel/comet-lake/default.nix → common/gpu/intel/comet-lake/default.nix
View file
Open in desktop
File renamed without changes.
0 common/cpu/intel/elkhart-lake/default.nix → common/gpu/intel/elkhart-lake/default.nix
View file
Open in desktop
File renamed without changes.
0 common/cpu/intel/jasper-lake/default.nix → common/gpu/intel/jasper-lake/default.nix
View file
Open in desktop
File renamed without changes.
0 common/cpu/intel/kaby-lake/default.nix → common/gpu/intel/kaby-lake/default.nix
View file
Open in desktop
File renamed without changes.
0 common/cpu/intel/sandy-bridge/default.nix → common/gpu/intel/sandy-bridge/default.nix
View file
Open in desktop
File renamed without changes.
0 common/cpu/intel/tiger-lake/default.nix → common/gpu/intel/tiger-lake/default.nix
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion dell/inspiron/5509/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, ... }:
{
imports = [
../../../common/cpu/intel/tiger-lake
../../../common/gpu/intel/tiger-lake
../../../common/pc/laptop
../../../common/pc/ssd
];
Expand Down
2 changes: 1 addition & 1 deletion dell/precision/7520/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dell/xps/13-9360/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
imports = [
../../../common/cpu/intel/kaby-lake
../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop
];

Expand Down
2 changes: 1 addition & 1 deletion dell/xps/13-9370/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{
imports = [
../../../common/cpu/intel/kaby-lake
../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop
../../../common/pc/laptop/acpi_call.nix
];
Expand Down
2 changes: 1 addition & 1 deletion dell/xps/15-9560/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
imports = [
../../../common/cpu/intel
../../../common/cpu/intel/kaby-lake
../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop
./xps-common.nix

Expand Down
2 changes: 1 addition & 1 deletion dell/xps/15-9560/intel/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion dell/xps/15-9570/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
imports = [
../../../common/cpu/intel
../../../common/cpu/intel/kaby-lake
../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop
./xps-common.nix
];
Expand Down
6 changes: 3 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,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;
Expand Down
2 changes: 1 addition & 1 deletion google/pixelbook/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
imports = [
../../common/pc/laptop
../../common/pc/laptop/ssd
../../common/cpu/intel/kaby-lake
../../common/gpu/intel/kaby-lake
];
}
2 changes: 1 addition & 1 deletion gpd/p2-max/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
];
}
2 changes: 1 addition & 1 deletion hardkernel/odroid-h3/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
imports = [
../../common/cpu/intel/jasper-lake
../../common/gpu/intel/jasper-lake
];
}
2 changes: 1 addition & 1 deletion hp/elitebook/2560p/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hp/notebook/14-df0023/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion huawei/machc-wa/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lenovo/thinkpad/e470/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
imports = [
../.
../../../common/cpu/intel/kaby-lake
../../../common/gpu/intel/kaby-lake
../../../common/gpu/nvidia/prime.nix
];

Expand Down
2 changes: 1 addition & 1 deletion lenovo/thinkpad/l480/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
imports = [
../.
../../../common/cpu/intel/kaby-lake
../../../common/gpu/intel/kaby-lake
../../../common/pc/laptop/ssd
];

Expand Down
2 changes: 1 addition & 1 deletion lenovo/thinkpad/p51/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
../.
];
Expand Down
2 changes: 1 addition & 1 deletion lenovo/thinkpad/t420/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
imports = [
../.
../tp-smapi.nix
../../../common/cpu/intel/sandy-bridge
../../../common/gpu/intel/sandy-bridge
../../../common/pc/laptop/acpi_call.nix
];
}
2 changes: 1 addition & 1 deletion lenovo/thinkpad/t520/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
imports = [
../.
../tp-smapi.nix
../../../common/cpu/intel/sandy-bridge
../../../common/gpu/intel/sandy-bridge
../../../common/pc/laptop/acpi_call.nix
];
}
2 changes: 1 addition & 1 deletion lenovo/thinkpad/w520/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
imports = [
../.
../tp-smapi.nix
../../../common/cpu/intel/sandy-bridge
../../../common/gpu/intel/sandy-bridge
../../../common/pc/laptop/acpi_call.nix
];
}
2 changes: 1 addition & 1 deletion lenovo/thinkpad/x220/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
];
Expand Down
2 changes: 1 addition & 1 deletion microsoft/surface/surface-go/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion protectli/vp4670/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
imports = [
../../common/cpu/intel/comet-lake
../../common/gpu/intel/comet-lake
];

boot.initrd.kernelModules = [
Expand Down