aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge #502

Browse source 
502: common/gpu/nvidia*: Migrate to common/gpu/nvidia/* and add non-prime r=Mic92 a=TLATER



Co-authored-by: Tristan Daniël Maat <tristan.maat@codethink.co.uk>
This commit is contained in:
bors[bot] 2022-11-22 19:43:54 +00:00 committed by GitHub
parent 1108c1b861 cdd049a353
commit 0099253ad0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 79 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
asus/rog-strix/g733qs/default.nix
View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd/pstate.nix ../../../common/cpu/amd/pstate.nix
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/ssd ../../../common/pc/ssd
../../battery.nix ../../battery.nix

2
asus/zephyrus/ga401/default.nix
View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/ssd ../../../common/pc/ssd
]; ];

2
asus/zephyrus/ga503/default.nix
View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/ssd ../../../common/pc/ssd
]; ];

14
common/gpu/nvidia-disable.nix
View file

@ -1,9 +1,11 @@
{ lib, pkgs, ... }:
{ {
# This runs only intel/amdgpu igpus and nvidia dgpus do not drain power. imports = [ ./nvidia/disable.nix ];
##### disable nvidia, very nice battery life. warnings = [
hardware.nvidiaOptimus.disable = lib.mkDefault true; ''
boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" ]; DEPRECATED: The <nixos-hardware/common/gpu/nvidia-disable.nix> module has been deprecated.
Switch to using <nixos-hardware/common/gpu/nvidia/disable.nix> instead.
''
];
} }

28
common/gpu/nvidia.nix
View file

@ -1,26 +1,12 @@
{ lib, pkgs, ... }:
# This creates a new 'nvidia-offload' program that runs the application passed to it on the GPU
# As per https://nixos.wiki/wiki/Nvidia
let
nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
export __GLX_VENDOR_LIBRARY_NAME=nvidia
export __VK_LAYER_NV_optimus=NVIDIA_only
exec "$@"
'';
in
{ {
services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ]; imports = [ ./nvidia/prime.nix ];
environment.systemPackages = [ nvidia-offload ];
hardware.nvidia.prime = { warnings = [
offload.enable = lib.mkDefault true; ''
# Hardware should specify the bus ID for intel/nvidia devices DEPRECATED: The <nixos-hardware/common/gpu/nvidia.nix> module has been deprecated.
};
hardware.opengl.extraPackages = with pkgs; [ Switch to using <nixos-hardware/common/gpu/nvidia/prime.nix> instead if you use prime offloading.
vaapiVdpau If you are using this without prime, consider switching to <nixos-hardware/common/gpu/nvidia> instead.
''
]; ];
} }

8
common/gpu/nvidia/default.nix Normal file
View file

@ -0,0 +1,8 @@
{ lib, pkgs, ... }:
{
services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
hardware.opengl.extraPackages = with pkgs; [
vaapiVdpau
];
}

9
common/gpu/nvidia/disable.nix Normal file
View file

@ -0,0 +1,9 @@
{ lib, pkgs, ... }:
{
# This runs only intel/amdgpu igpus and nvidia dgpus do not drain power.
##### disable nvidia, very nice battery life.
hardware.nvidiaOptimus.disable = lib.mkDefault true;
boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" ];
}

22
common/gpu/nvidia/prime.nix Normal file
View file

@ -0,0 +1,22 @@
{ lib, pkgs, ... }:
# This creates a new 'nvidia-offload' program that runs the application passed to it on the GPU
# As per https://nixos.wiki/wiki/Nvidia
let
nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
export __GLX_VENDOR_LIBRARY_NAME=nvidia
export __VK_LAYER_NV_optimus=NVIDIA_only
exec "$@"
'';
in {
imports = [ ./. ];
environment.systemPackages = [ nvidia-offload ];
hardware.nvidia.prime = {
offload.enable = lib.mkDefault true;
# Hardware should specify the bus ID for intel/nvidia devices
};
}

2
dell/g3/3779/default.nix
View file

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

2
dell/xps/15-9500/nvidia/default.nix
View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../default.nix ../default.nix
../../../../common/gpu/nvidia.nix ../../../../common/gpu/nvidia/prime.nix
]; ];
hardware.nvidia.prime = { hardware.nvidia.prime = {

2
dell/xps/15-9550/default.nix
View file

@ -5,7 +5,7 @@
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/pc/laptop ../../../common/pc/laptop
# To just use Intel integrated graphics with Intel's open source driver # To just use Intel integrated graphics with Intel's open source driver
# ../../../common/gpu/nvidia-disable # ../../../common/gpu/nvidia/disable.nix
]; ];
# TODO: boot loader # TODO: boot loader

2
dell/xps/15-9550/nvidia/default.nix
View file

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
../default.nix ../default.nix
../../../../common/gpu/nvidia.nix ../../../../common/gpu/nvidia/prime.nix
]; ];
hardware.nvidia.prime = { hardware.nvidia.prime = {

2
dell/xps/15-9560/intel/default.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
../../../../common/cpu/intel ../../../../common/cpu/intel
../../../../common/pc/laptop ../../../../common/pc/laptop
../../../../common/gpu/nvidia-disable.nix ../../../../common/gpu/nvidia/disable.nix
../xps-common.nix ../xps-common.nix
]; ];
} }

2
dell/xps/15-9560/nvidia/default.nix
View file

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

2
dell/xps/17-9700/intel/default.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
../../../../common/cpu/intel ../../../../common/cpu/intel
../../../../common/pc/laptop ../../../../common/pc/laptop
../../../../common/gpu/nvidia-disable.nix ../../../../common/gpu/nvidia/disable.nix
../common.nix ../common.nix
]; ];
} }

2
dell/xps/17-9700/nvidia/default.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
../../../../common/cpu/intel ../../../../common/cpu/intel
../../../../common/pc/laptop ../../../../common/pc/laptop
../../../../common/gpu/nvidia.nix ../../../../common/gpu/nvidia/prime.nix
../common.nix ../common.nix
]; ];

5
flake.nix
View file

@ -157,8 +157,9 @@
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;
common-gpu-intel = import ./common/gpu/intel.nix; common-gpu-intel = import ./common/gpu/intel.nix;
common-gpu-nvidia = import ./common/gpu/nvidia.nix; common-gpu-nvidia = import ./common/gpu/nvidia/prime.nix;
common-gpu-nvidia-disable = import ./common/gpu/nvidia-disable.nix; common-gpu-nvidia-nonprime = import ./common/gpu/nvidia;
common-gpu-nvidia-disable = import ./common/gpu/nvidia/disable.nix;
common-pc = import ./common/pc; common-pc = import ./common/pc;
common-pc-hdd = import ./common/pc/hdd; common-pc-hdd = import ./common/pc/hdd;
common-pc-laptop = import ./common/pc/laptop; common-pc-laptop = import ./common/pc/laptop;

2
lenovo/ideapad/15arh05/default.nix
View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../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

2
lenovo/legion/15ach6/default.nix
View file

@ -4,7 +4,7 @@ in {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/amd ../../../common/gpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];

2
lenovo/legion/15arh05h/default.nix
View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../../common/cpu/amd ../../../common/cpu/amd
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop ../../../common/pc/laptop
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];

2
lenovo/legion/16ithg6/default.nix
View file

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

2
lenovo/thinkpad/e470/default.nix
View file

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

2
lenovo/thinkpad/p1/default.nix
View file

@ -3,7 +3,7 @@
../../../common/cpu/intel ../../../common/cpu/intel
# might need nvidia module but we don't know the PCI ids: # might need nvidia module but we don't know the PCI ids:
# https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740 # https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740
#../../../common/gpu/nvidia.nix #../../../common/gpu/nvidia/prime.nix
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
../../../common/pc/laptop/ssd ../../../common/pc/laptop/ssd
]; ];

2
lenovo/thinkpad/p50/default.nix
View file

@ -1,6 +1,6 @@
{ lib, config, ... }: { { lib, config, ... }: {
imports = [ imports = [
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
../. ../.

2
lenovo/thinkpad/p51/default.nix
View file

@ -1,6 +1,6 @@
{ config, lib, ... }: { { config, lib, ... }: {
imports = [ imports = [
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/cpu/intel/kaby-lake ../../../common/cpu/intel/kaby-lake
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix

2
lenovo/thinkpad/p52/default.nix
View file

@ -1,6 +1,6 @@
{ lib, config, ... }: { { lib, config, ... }: {
imports = [ imports = [
../../../common/gpu/nvidia.nix ../../../common/gpu/nvidia/prime.nix
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/pc/laptop/acpi_call.nix ../../../common/pc/laptop/acpi_call.nix
../. ../.

2
msi/gl62/default.nix
View file

@ -4,7 +4,7 @@
imports = [ imports = [
../../common/pc/laptop/ssd ../../common/pc/laptop/ssd
../../common/cpu/intel ../../common/cpu/intel
../../common/gpu/nvidia.nix ../../common/gpu/nvidia/prime.nix
../../common/pc/laptop ../../common/pc/laptop
]; ];

2
omen/en00015p/default.nix
View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
../../common/cpu/amd ../../common/cpu/amd
../../common/gpu/nvidia.nix ../../common/gpu/nvidia/prime.nix
../../common/pc/laptop ../../common/pc/laptop
../../common/pc/ssd ../../common/pc/ssd
]; ];