mirror of
https://github.com/NixOS/nixos-hardware
synced 2024-11-22 19:09:42 +01:00
treewide: Switch from gpu/intel to cpu/intel where applicable
This commit is contained in:
parent
c058019ce1
commit
7495e87753
35 changed files with 32 additions and 51 deletions
|
@ -7,7 +7,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/gpu/nvidia
|
../../../common/gpu/nvidia
|
||||||
../../../common/gpu/nvidia/kepler
|
../../../common/gpu/nvidia/kepler
|
||||||
../../../common/hidpi.nix
|
../../../common/hidpi.nix
|
||||||
|
|
|
@ -6,8 +6,7 @@
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel/kaby-lake
|
../../../common/cpu/intel/kaby-lake
|
||||||
../../../common/gpu/intel
|
|
||||||
../../../common/gpu/amd
|
../../../common/gpu/amd
|
||||||
../../../common/hidpi.nix
|
../../../common/hidpi.nix
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
|
|
|
@ -3,13 +3,11 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../.
|
../../.
|
||||||
|
../../../common/cpu/intel
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/ssd
|
../../../common/pc/ssd
|
||||||
];
|
];
|
||||||
|
|
||||||
# Built-in iSight is recognized by the generic uvcvideo kernel module
|
# Built-in iSight is recognized by the generic uvcvideo kernel module
|
||||||
hardware.facetimehd.enable = false;
|
hardware.facetimehd.enable = false;
|
||||||
|
|
||||||
hardware.cpu.intel.updateMicrocode =
|
|
||||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel/sandy-bridge
|
../../../common/cpu/intel/sandy-bridge
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
|
|
|
@ -6,8 +6,7 @@
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel/kaby-lake
|
../../../common/cpu/intel/kaby-lake
|
||||||
../../../common/gpu/intel
|
|
||||||
../../../common/hidpi.nix
|
../../../common/hidpi.nix
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel/sandy-bridge
|
../../../common/cpu/intel/sandy-bridge
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/gpu/intel/tiger-lake
|
../../../common/cpu/intel/tiger-lake
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
../../battery.nix
|
../../battery.nix
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/gpu/intel/tiger-lake
|
../../../common/cpu/intel/tiger-lake
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/ssd
|
../../../common/pc/ssd
|
||||||
];
|
];
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel/tiger-lake
|
||||||
../../../common/gpu/intel/tiger-lake
|
|
||||||
../../../common/gpu/nvidia/turing
|
../../../common/gpu/nvidia/turing
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/gpu/intel/kaby-lake
|
../../../common/cpu/intel/kaby-lake
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
../../../common/gpu/nvidia
|
../../../common/gpu/nvidia
|
||||||
|
|
|
@ -6,7 +6,6 @@ let
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/gpu/intel
|
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
../../../common/pc/ssd
|
../../../common/pc/ssd
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/gpu/intel/kaby-lake
|
../../../common/cpu/intel/kaby-lake
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/gpu/intel/kaby-lake
|
../../../common/cpu/intel/kaby-lake
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../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
|
||||||
../../../common/gpu/nvidia
|
../../../common/gpu/nvidia
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../../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
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../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
|
||||||
];
|
];
|
||||||
|
|
|
@ -4,6 +4,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../common/pc/laptop
|
../../common/pc/laptop
|
||||||
../../common/pc/laptop/ssd
|
../../common/pc/laptop/ssd
|
||||||
../../common/gpu/intel/kaby-lake
|
../../common/cpu/intel/kaby-lake
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../common/pc/laptop
|
../../common/pc/laptop
|
||||||
../../common/pc/laptop/ssd
|
../../common/pc/laptop/ssd
|
||||||
../../common/cpu/intel
|
../../common/cpu/intel/kaby-lake
|
||||||
../../common/gpu/intel/kaby-lake
|
|
||||||
../../common/hidpi.nix
|
../../common/hidpi.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../common/gpu/intel/jasper-lake
|
../../common/cpu/intel/jasper-lake
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../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
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel/tiger-lake
|
||||||
../../../common/gpu/intel/tiger-lake
|
|
||||||
../../../common/pc
|
../../../common/pc
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
|
|
|
@ -2,8 +2,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../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
|
||||||
|
|
|
@ -5,8 +5,7 @@
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
../../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
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel/kaby-lake
|
../../../common/cpu/intel/kaby-lake
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
../../../common/gpu/nvidia/maxwell
|
../../../common/gpu/nvidia/maxwell
|
||||||
];
|
];
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel/kaby-lake
|
../../../common/cpu/intel/kaby-lake
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -3,8 +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/gpu/nvidia/maxwell
|
../../../common/gpu/nvidia/maxwell
|
||||||
../../../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
|
||||||
../.
|
../.
|
||||||
];
|
];
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../tp-smapi.nix
|
../tp-smapi.nix
|
||||||
../../../common/gpu/intel/sandy-bridge
|
../../../common/cpu/intel/sandy-bridge
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/gpu/intel
|
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
../../../common/pc/ssd
|
../../../common/pc/ssd
|
||||||
../.
|
../.
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../tp-smapi.nix
|
../tp-smapi.nix
|
||||||
../../../common/gpu/intel/sandy-bridge
|
../../../common/cpu/intel/sandy-bridge
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../tp-smapi.nix
|
../tp-smapi.nix
|
||||||
../../../common/gpu/intel/sandy-bridge
|
../../../common/cpu/intel/sandy-bridge
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel/sandy-bridge
|
../../../common/cpu/intel/sandy-bridge
|
||||||
../../../common/pc/laptop/hdd # TODO: reverse compat
|
../../../common/pc/laptop/hdd # TODO: reverse compat
|
||||||
../tp-smapi.nix
|
../tp-smapi.nix
|
||||||
];
|
];
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
|
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
|
|
||||||
../../../common/gpu/intel
|
|
||||||
../../../common/gpu/nvidia/disable.nix
|
../../../common/gpu/nvidia/disable.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -13,8 +13,7 @@ in {
|
||||||
../../../common/pc
|
../../../common/pc
|
||||||
../../../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/kaby-lake
|
||||||
../../../common/gpu/intel/kaby-lake
|
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel/comet-lake
|
||||||
../../../common/gpu/intel/comet-lake
|
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
../../../common/gpu/nvidia/turing
|
../../../common/gpu/nvidia/turing
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../common/gpu/intel/comet-lake
|
../../common/cpu/intel/comet-lake
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.kernelModules = [
|
boot.initrd.kernelModules = [
|
||||||
|
|
Loading…
Reference in a new issue