diff --git a/apple/imac/14-2/default.nix b/apple/imac/14-2/default.nix index e85e1725e..c64f96719 100644 --- a/apple/imac/14-2/default.nix +++ b/apple/imac/14-2/default.nix @@ -9,6 +9,7 @@ ../. ../../../common/gpu/intel ../../../common/gpu/nvidia + ../../../common/gpu/nvidia/kepler ../../../common/hidpi.nix ]; diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix index 2a2c624df..083022899 100644 --- a/apple/macbook-pro/10-1/default.nix +++ b/apple/macbook-pro/10-1/default.nix @@ -5,6 +5,7 @@ ../. ../../../common/pc/laptop/ssd ../../../common/gpu/24.05-compat.nix + ../../../common/gpu/nvidia/kepler ]; # TODO: reverse compat diff --git a/common/gpu/nvidia/kepler/default.nix b/common/gpu/nvidia/kepler/default.nix new file mode 100644 index 000000000..f8d89a1e4 --- /dev/null +++ b/common/gpu/nvidia/kepler/default.nix @@ -0,0 +1,7 @@ +{lib, ...}: +{ + imports = [ ../. ]; + + # The open source driver does not support Kepler GPUs. + hardware.nvidia.open = false; +} diff --git a/focus/m2/gen1/default.nix b/focus/m2/gen1/default.nix index 27ee1f3e3..b6a2c7891 100644 --- a/focus/m2/gen1/default.nix +++ b/focus/m2/gen1/default.nix @@ -4,6 +4,7 @@ imports = [ ../../../common/cpu/intel ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/turing ../../../common/pc/laptop ../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/ssd diff --git a/lenovo/ideapad/15ach6/default.nix b/lenovo/ideapad/15ach6/default.nix index c771f1bdd..e86fee900 100644 --- a/lenovo/ideapad/15ach6/default.nix +++ b/lenovo/ideapad/15ach6/default.nix @@ -6,6 +6,7 @@ ../../../common/cpu/amd/pstate.nix ../../../common/gpu/amd ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/turing ../../../common/pc/laptop ../../../common/pc/laptop/ssd ]; diff --git a/lenovo/ideapad/15arh05/default.nix b/lenovo/ideapad/15arh05/default.nix index 46dfd24ff..87229c52b 100644 --- a/lenovo/ideapad/15arh05/default.nix +++ b/lenovo/ideapad/15arh05/default.nix @@ -4,6 +4,7 @@ imports = [ ../../../common/cpu/amd ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/turing ../../../common/pc/laptop ../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/ssd diff --git a/lenovo/ideapad/16ach6/default.nix b/lenovo/ideapad/16ach6/default.nix index 3f9beb1ce..aeec32987 100644 --- a/lenovo/ideapad/16ach6/default.nix +++ b/lenovo/ideapad/16ach6/default.nix @@ -6,6 +6,7 @@ ../../../common/cpu/amd/pstate.nix ../../../common/gpu/amd ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/turing ../../../common/pc/laptop ../../../common/pc/laptop/ssd ]; diff --git a/lenovo/legion/15ach6/default.nix b/lenovo/legion/15ach6/default.nix index a3c00fd7b..0166a5fe4 100644 --- a/lenovo/legion/15ach6/default.nix +++ b/lenovo/legion/15ach6/default.nix @@ -4,6 +4,7 @@ ../../../common/cpu/amd ../../../common/gpu/amd ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/ampere ../../../common/hidpi.nix ../../../common/pc/laptop ../../../common/pc/laptop/ssd diff --git a/lenovo/legion/15ach6h/hybrid/default.nix b/lenovo/legion/15ach6h/hybrid/default.nix index 2f12f7eaa..044d088b2 100644 --- a/lenovo/legion/15ach6h/hybrid/default.nix +++ b/lenovo/legion/15ach6h/hybrid/default.nix @@ -6,6 +6,7 @@ ../../../../common/cpu/amd/pstate.nix ../../../../common/gpu/amd ../../../../common/gpu/nvidia/prime.nix + ../../../../common/gpu/nvidia/ampere ../../../../common/pc/laptop ../../../../common/pc/laptop/ssd ]; diff --git a/lenovo/legion/15ich/default.nix b/lenovo/legion/15ich/default.nix index 9fa70b7b9..8aaffff89 100644 --- a/lenovo/legion/15ich/default.nix +++ b/lenovo/legion/15ich/default.nix @@ -4,6 +4,7 @@ imports = [ ../../../common/cpu/intel ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/pascal ../../../common/pc/laptop ../../../common/pc/laptop/ssd ../../../common/pc/laptop/hdd diff --git a/lenovo/legion/16irx8h/default.nix b/lenovo/legion/16irx8h/default.nix index cfbcb8aa4..6d9c772c3 100644 --- a/lenovo/legion/16irx8h/default.nix +++ b/lenovo/legion/16irx8h/default.nix @@ -6,6 +6,7 @@ imports = [ ../../../common/cpu/intel ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/ada-lovelace ../../../common/pc/laptop ../../../common/pc/laptop/ssd ../../../common/hidpi.nix diff --git a/lenovo/legion/16ithg6/default.nix b/lenovo/legion/16ithg6/default.nix index e26461ddd..9d6c292fb 100644 --- a/lenovo/legion/16ithg6/default.nix +++ b/lenovo/legion/16ithg6/default.nix @@ -4,6 +4,7 @@ imports = [ ../../../common/cpu/intel ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/ampere ../../../common/pc/laptop ../../../common/pc/laptop/ssd ../../../common/hidpi.nix diff --git a/lenovo/legion/t526amr5/default.nix b/lenovo/legion/t526amr5/default.nix index ba1d623c2..41314459d 100644 --- a/lenovo/legion/t526amr5/default.nix +++ b/lenovo/legion/t526amr5/default.nix @@ -9,4 +9,7 @@ # TPM2 module security.tpm2.enable = true; + + # Device could have multiple architectures, but they all support open + hardware.nvidia.open = true; } diff --git a/lenovo/thinkpad/e470/default.nix b/lenovo/thinkpad/e470/default.nix index 55aa595a8..e963e12b7 100644 --- a/lenovo/thinkpad/e470/default.nix +++ b/lenovo/thinkpad/e470/default.nix @@ -5,6 +5,7 @@ ../. ../../../common/gpu/intel/kaby-lake ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/maxwell ]; hardware.nvidia.prime = { diff --git a/lenovo/thinkpad/p14s/intel/gen3/default.nix b/lenovo/thinkpad/p14s/intel/gen3/default.nix index 4c7361138..427d56c09 100644 --- a/lenovo/thinkpad/p14s/intel/gen3/default.nix +++ b/lenovo/thinkpad/p14s/intel/gen3/default.nix @@ -4,6 +4,7 @@ imports = [ ../. ../../../../../common/gpu/nvidia/prime.nix + ../../../../../common/gpu/nvidia/turing ]; hardware = { diff --git a/lenovo/thinkpad/p50/default.nix b/lenovo/thinkpad/p50/default.nix index ef2cbd568..625d7cb76 100644 --- a/lenovo/thinkpad/p50/default.nix +++ b/lenovo/thinkpad/p50/default.nix @@ -1,6 +1,7 @@ { lib, config, ... }: { imports = [ ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/maxwell ../../../common/cpu/intel ../../../common/pc/laptop/acpi_call.nix ../. diff --git a/lenovo/thinkpad/p51/default.nix b/lenovo/thinkpad/p51/default.nix index 6bd162dbc..12de3ca3a 100644 --- a/lenovo/thinkpad/p51/default.nix +++ b/lenovo/thinkpad/p51/default.nix @@ -2,6 +2,7 @@ imports = [ ../../../common/gpu/24.05-compat.nix ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/maxwell ../../../common/cpu/intel ../../../common/gpu/intel/kaby-lake ../../../common/pc/laptop/acpi_call.nix diff --git a/lenovo/thinkpad/p52/default.nix b/lenovo/thinkpad/p52/default.nix index 2f6676a55..2ca38aee1 100644 --- a/lenovo/thinkpad/p52/default.nix +++ b/lenovo/thinkpad/p52/default.nix @@ -2,6 +2,7 @@ imports = [ ../../../common/gpu/24.05-compat.nix ../../../common/gpu/nvidia/prime.nix + ../../../common/gpu/nvidia/pascal ../../../common/cpu/intel ../../../common/pc/laptop/acpi_call.nix ../. diff --git a/lenovo/yoga/7/14ARH7/nvidia/default.nix b/lenovo/yoga/7/14ARH7/nvidia/default.nix index 0ca5afd70..cf7aedc96 100644 --- a/lenovo/yoga/7/14ARH7/nvidia/default.nix +++ b/lenovo/yoga/7/14ARH7/nvidia/default.nix @@ -11,6 +11,7 @@ in { ## "prime.nix" loads this, aleady: # ../../../../common/gpu/nvidia ../../../../../common/gpu/nvidia/prime.nix + ../../../../../common/gpu/nvidia/ampere ]; # NVIDIA GeForce RTX 3050 Mobile (Ampere) diff --git a/msi/gl62/default.nix b/msi/gl62/default.nix index 049ffcfb7..977af651d 100644 --- a/msi/gl62/default.nix +++ b/msi/gl62/default.nix @@ -5,6 +5,7 @@ ../../common/pc/laptop/ssd ../../common/cpu/intel ../../common/gpu/nvidia/prime.nix + ../../common/gpu/nvidia/pascal ../../common/pc/laptop ]; diff --git a/omen/14-fb0798ng/default.nix b/omen/14-fb0798ng/default.nix index 20ce9a331..b13824555 100644 --- a/omen/14-fb0798ng/default.nix +++ b/omen/14-fb0798ng/default.nix @@ -4,6 +4,7 @@ imports = [ ../../common/cpu/intel ../../common/gpu/nvidia/prime.nix + ../../common/gpu/nvidia/ada-lovelace ../../common/pc/laptop ../../common/pc/ssd ]; diff --git a/omen/15-en0002np/default.nix b/omen/15-en0002np/default.nix index 77f943ffc..00606cc5a 100644 --- a/omen/15-en0002np/default.nix +++ b/omen/15-en0002np/default.nix @@ -5,6 +5,7 @@ ../../common/cpu/amd ../../common/cpu/amd/pstate.nix ../../common/gpu/nvidia/prime.nix + ../../common/gpu/nvidia/turing ../../common/pc/laptop ../../common/pc/ssd ]; diff --git a/omen/15-en0010ca/default.nix b/omen/15-en0010ca/default.nix index ff94913f4..da3c85e8a 100644 --- a/omen/15-en0010ca/default.nix +++ b/omen/15-en0010ca/default.nix @@ -6,6 +6,7 @@ ../../common/cpu/amd/pstate.nix ../../common/gpu/amd ../../common/gpu/nvidia/prime.nix + ../../common/gpu/nvidia/turing ../../common/pc/laptop ../../common/pc/ssd ]; diff --git a/omen/15-en1007sa/default.nix b/omen/15-en1007sa/default.nix index 3929c66ff..704e4d8bd 100644 --- a/omen/15-en1007sa/default.nix +++ b/omen/15-en1007sa/default.nix @@ -5,6 +5,7 @@ ../../common/cpu/amd ../../common/cpu/amd/pstate.nix ../../common/gpu/nvidia/prime.nix + ../../common/gpu/nvidia/ampere ../../common/pc/laptop ../../common/pc/ssd ]; diff --git a/omen/16-n0280nd/default.nix b/omen/16-n0280nd/default.nix index 3929c66ff..704e4d8bd 100644 --- a/omen/16-n0280nd/default.nix +++ b/omen/16-n0280nd/default.nix @@ -5,6 +5,7 @@ ../../common/cpu/amd ../../common/cpu/amd/pstate.nix ../../common/gpu/nvidia/prime.nix + ../../common/gpu/nvidia/ampere ../../common/pc/laptop ../../common/pc/ssd ]; diff --git a/system76/gaze18/default.nix b/system76/gaze18/default.nix index 0485e16c8..dd4302b8b 100644 --- a/system76/gaze18/default.nix +++ b/system76/gaze18/default.nix @@ -3,6 +3,7 @@ imports = [ ../. ../../common/gpu/nvidia/prime.nix + ../../common/gpu/nvidia/ampere ]; boot.initrd.kernelModules = [ "nvidia" ];