mirror of
https://github.com/NixOS/nixos-hardware
synced 2024-11-09 20:49:40 +01:00
Merge pull request #1107 from Lyndeno/nvidia_fix
Treewide: Add Nvidia Architecture
This commit is contained in:
commit
880be1ab83
26 changed files with 34 additions and 0 deletions
|
@ -9,6 +9,7 @@
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel
|
../../../common/gpu/intel
|
||||||
../../../common/gpu/nvidia
|
../../../common/gpu/nvidia
|
||||||
|
../../../common/gpu/nvidia/kepler
|
||||||
../../../common/hidpi.nix
|
../../../common/hidpi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
../.
|
../.
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
../../../common/gpu/24.05-compat.nix
|
../../../common/gpu/24.05-compat.nix
|
||||||
|
../../../common/gpu/nvidia/kepler
|
||||||
];
|
];
|
||||||
|
|
||||||
# TODO: reverse compat
|
# TODO: reverse compat
|
||||||
|
|
7
common/gpu/nvidia/kepler/default.nix
Normal file
7
common/gpu/nvidia/kepler/default.nix
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
{lib, ...}:
|
||||||
|
{
|
||||||
|
imports = [ ../. ];
|
||||||
|
|
||||||
|
# The open source driver does not support Kepler GPUs.
|
||||||
|
hardware.nvidia.open = false;
|
||||||
|
}
|
|
@ -4,6 +4,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/turing
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
../../../common/cpu/amd/pstate.nix
|
../../../common/cpu/amd/pstate.nix
|
||||||
../../../common/gpu/amd
|
../../../common/gpu/amd
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/turing
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
];
|
];
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/amd
|
../../../common/cpu/amd
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/turing
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
../../../common/cpu/amd/pstate.nix
|
../../../common/cpu/amd/pstate.nix
|
||||||
../../../common/gpu/amd
|
../../../common/gpu/amd
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/turing
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
];
|
];
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
../../../common/cpu/amd
|
../../../common/cpu/amd
|
||||||
../../../common/gpu/amd
|
../../../common/gpu/amd
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/ampere
|
||||||
../../../common/hidpi.nix
|
../../../common/hidpi.nix
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
../../../../common/cpu/amd/pstate.nix
|
../../../../common/cpu/amd/pstate.nix
|
||||||
../../../../common/gpu/amd
|
../../../../common/gpu/amd
|
||||||
../../../../common/gpu/nvidia/prime.nix
|
../../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../../common/gpu/nvidia/ampere
|
||||||
../../../../common/pc/laptop
|
../../../../common/pc/laptop
|
||||||
../../../../common/pc/laptop/ssd
|
../../../../common/pc/laptop/ssd
|
||||||
];
|
];
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/pascal
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
../../../common/pc/laptop/hdd
|
../../../common/pc/laptop/hdd
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/ada-lovelace
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
../../../common/hidpi.nix
|
../../../common/hidpi.nix
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/ampere
|
||||||
../../../common/pc/laptop
|
../../../common/pc/laptop
|
||||||
../../../common/pc/laptop/ssd
|
../../../common/pc/laptop/ssd
|
||||||
../../../common/hidpi.nix
|
../../../common/hidpi.nix
|
||||||
|
|
|
@ -9,4 +9,7 @@
|
||||||
|
|
||||||
# TPM2 module
|
# TPM2 module
|
||||||
security.tpm2.enable = true;
|
security.tpm2.enable = true;
|
||||||
|
|
||||||
|
# Device could have multiple architectures, but they all support open
|
||||||
|
hardware.nvidia.open = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
../.
|
../.
|
||||||
../../../common/gpu/intel/kaby-lake
|
../../../common/gpu/intel/kaby-lake
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/maxwell
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.nvidia.prime = {
|
hardware.nvidia.prime = {
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../../../../common/gpu/nvidia/prime.nix
|
../../../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../../../common/gpu/nvidia/turing
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ lib, config, ... }: {
|
{ lib, config, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
../../../common/gpu/nvidia/prime.nix
|
../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../common/gpu/nvidia/maxwell
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
../.
|
../.
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../../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/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/gpu/intel/kaby-lake
|
../../../common/gpu/intel/kaby-lake
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../../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/pascal
|
||||||
../../../common/cpu/intel
|
../../../common/cpu/intel
|
||||||
../../../common/pc/laptop/acpi_call.nix
|
../../../common/pc/laptop/acpi_call.nix
|
||||||
../.
|
../.
|
||||||
|
|
|
@ -11,6 +11,7 @@ in {
|
||||||
## "prime.nix" loads this, aleady:
|
## "prime.nix" loads this, aleady:
|
||||||
# ../../../../common/gpu/nvidia
|
# ../../../../common/gpu/nvidia
|
||||||
../../../../../common/gpu/nvidia/prime.nix
|
../../../../../common/gpu/nvidia/prime.nix
|
||||||
|
../../../../../common/gpu/nvidia/ampere
|
||||||
];
|
];
|
||||||
|
|
||||||
# NVIDIA GeForce RTX 3050 Mobile (Ampere)
|
# NVIDIA GeForce RTX 3050 Mobile (Ampere)
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
../../common/pc/laptop/ssd
|
../../common/pc/laptop/ssd
|
||||||
../../common/cpu/intel
|
../../common/cpu/intel
|
||||||
../../common/gpu/nvidia/prime.nix
|
../../common/gpu/nvidia/prime.nix
|
||||||
|
../../common/gpu/nvidia/pascal
|
||||||
../../common/pc/laptop
|
../../common/pc/laptop
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../../common/cpu/intel
|
../../common/cpu/intel
|
||||||
../../common/gpu/nvidia/prime.nix
|
../../common/gpu/nvidia/prime.nix
|
||||||
|
../../common/gpu/nvidia/ada-lovelace
|
||||||
../../common/pc/laptop
|
../../common/pc/laptop
|
||||||
../../common/pc/ssd
|
../../common/pc/ssd
|
||||||
];
|
];
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
../../common/cpu/amd
|
../../common/cpu/amd
|
||||||
../../common/cpu/amd/pstate.nix
|
../../common/cpu/amd/pstate.nix
|
||||||
../../common/gpu/nvidia/prime.nix
|
../../common/gpu/nvidia/prime.nix
|
||||||
|
../../common/gpu/nvidia/turing
|
||||||
../../common/pc/laptop
|
../../common/pc/laptop
|
||||||
../../common/pc/ssd
|
../../common/pc/ssd
|
||||||
];
|
];
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
../../common/cpu/amd/pstate.nix
|
../../common/cpu/amd/pstate.nix
|
||||||
../../common/gpu/amd
|
../../common/gpu/amd
|
||||||
../../common/gpu/nvidia/prime.nix
|
../../common/gpu/nvidia/prime.nix
|
||||||
|
../../common/gpu/nvidia/turing
|
||||||
../../common/pc/laptop
|
../../common/pc/laptop
|
||||||
../../common/pc/ssd
|
../../common/pc/ssd
|
||||||
];
|
];
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
../../common/cpu/amd
|
../../common/cpu/amd
|
||||||
../../common/cpu/amd/pstate.nix
|
../../common/cpu/amd/pstate.nix
|
||||||
../../common/gpu/nvidia/prime.nix
|
../../common/gpu/nvidia/prime.nix
|
||||||
|
../../common/gpu/nvidia/ampere
|
||||||
../../common/pc/laptop
|
../../common/pc/laptop
|
||||||
../../common/pc/ssd
|
../../common/pc/ssd
|
||||||
];
|
];
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
../../common/cpu/amd
|
../../common/cpu/amd
|
||||||
../../common/cpu/amd/pstate.nix
|
../../common/cpu/amd/pstate.nix
|
||||||
../../common/gpu/nvidia/prime.nix
|
../../common/gpu/nvidia/prime.nix
|
||||||
|
../../common/gpu/nvidia/ampere
|
||||||
../../common/pc/laptop
|
../../common/pc/laptop
|
||||||
../../common/pc/ssd
|
../../common/pc/ssd
|
||||||
];
|
];
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
imports = [
|
imports = [
|
||||||
../.
|
../.
|
||||||
../../common/gpu/nvidia/prime.nix
|
../../common/gpu/nvidia/prime.nix
|
||||||
|
../../common/gpu/nvidia/ampere
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.kernelModules = [ "nvidia" ];
|
boot.initrd.kernelModules = [ "nvidia" ];
|
||||||
|
|
Loading…
Reference in a new issue