aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Hardware/Nvidia] Cleanup and fix some bugs

Browse source 
Fix suspend and add new environment variables.
This commit is contained in:
Antoine Viallon 2022-11-11 18:58:04 +01:00
parent 91b49073f2
commit 844b0be2df
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 76 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

123
hardware/nvidia/proprietary.nix
View file

@ -2,66 +2,95 @@
with lib; with lib;
let let
cfg = config.aviallon.hardware.nvidia; cfg = config.aviallon.hardware.nvidia;
generalCfg = config.aviallon.general;
toValue = x: if x then "1" else "0";
in { in {
config = mkIf (cfg.enable && cfg.useProprietary) { options = {
boot.initrd.kernelModules = [ aviallon.hardware.nvidia.proprietary = {
"nvidia" #enable = mkEnableOption "Wether to user NVidia proprietary drivers";
"nvidia_drm" gsync = mkEnableOption "Screen is GSYNC monitor";
"nvidia_uvm" vsync = mkOption {
"nvidia_modeset" description = "Wether to enable or disable vsync";
]; default = true;
# boot.blacklistedKernelModules = [ "nouveau" ]; example = false;
services.xserver.videoDrivers = [ type = types.bool;
"nvidia"
];
services.xserver.exportConfiguration = true;
hardware.nvidia = {
powerManagement.enable = true;
powerManagement.finegrained = mkIf config.hardware.nvidia.prime.offload.enable true;
modesetting.enable = true;
nvidiaSettings = true;
}; };
coolbits = mkOption {
description = "Coolbits value. Used for enabling hidden (dangerous) features";
default = if generalCfg.unsafeOptimizations then 28 else 5;
example = 28;
type = types.int;
};
};
};
aviallon.boot.cmdline = {} config = mkIf (cfg.enable && cfg.useProprietary) {
boot.initrd.kernelModules = [
"nvidia"
"nvidia_drm"
"nvidia_uvm"
"nvidia_modeset"
];
# boot.blacklistedKernelModules = [ "nouveau" ];
services.xserver.videoDrivers = [
"nvidia"
];
services.xserver.screenSection = ''
Option "Coolbits" "${toString cfg.proprietary.coolbits}"
Option "InbandStereoSignaling" "true"
'';
services.xserver.exportConfiguration = true;
hardware.nvidia = {
powerManagement.enable = true;
powerManagement.finegrained = mkIf config.hardware.nvidia.prime.offload.enable true;
modesetting.enable = true;
nvidiaSettings = true;
};
aviallon.boot.cmdline = {}
// { // {
"nvidia-drm.modeset" = 1; "nvidia-drm.modeset" = 1;
"nvidia.NVreg_UsePageAttributeTable" = 1; "nvidia.NVreg_UsePageAttributeTable" = 1;
} }
// optionalAttrs cfg.saveAllVram { // optionalAttrs cfg.saveAllVram {
"nvidia.NVreg_PreserveVideoMemoryAllocations" = 1; "nvidia.NVreg_PreserveVideoMemoryAllocations" = 1;
"nvidia.NVreg_TemporaryFilePath" = "/tmp/nvidia-gpu.vram.img"; "nvidia.NVreg_TemporaryFilePath" = "/var/tmp/nvidia-gpu.vram.img";
}; }
;
aviallon.programs.allowUnfreeList = [ aviallon.programs.allowUnfreeList = [
"nvidia-x11" "nvidia-x11"
"nvidia-settings" "nvidia-settings"
"cudatoolkit" "cudatoolkit"
]; ];
hardware.opengl.extraPackages = with pkgs; [ hardware.opengl.extraPackages = with pkgs; [
nvidia-vaapi-driver nvidia-vaapi-driver
libvdpau-va-gl libvdpau-va-gl
vaapiVdpau vaapiVdpau
]; ];
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [
nvidia-vaapi-driver nvidia-vaapi-driver
libvdpau-va-gl libvdpau-va-gl
vaapiVdpau vaapiVdpau
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nvtop nvtop
]; ];
# See documentation here: https://download.nvidia.com/XFree86/Linux-x86_64/510.60.02/README/openglenvvariables.html # See documentation here: https://download.nvidia.com/XFree86/Linux-x86_64/510.60.02/README/openglenvvariables.html
environment.variables = { environment.variables = {
"__GL_YIELD" = "USLEEP"; # use usleep(0) instead of sched_yield() -> better performance in most cases "__GL_YIELD" = "USLEEP"; # use usleep(0) instead of sched_yield() -> better performance in most cases
"__GL_ALLOW_UNOFFICIAL_PROTOCOL" = "1"; # allow unofficial GLX protocol if also set in Xorg conf "__GL_ALLOW_UNOFFICIAL_PROTOCOL" = "1"; # allow unofficial GLX protocol if also set in Xorg conf
"__GL_VRR_ALLOWED" = "1"; # Try to enable G-SYNC VRR if screen AND app is compatible "__GL_VRR_ALLOWED" = "1"; # Try to enable G-SYNC VRR if screen AND app is compatible
"KWIN_DRM_USE_EGL_STREAMS" = "1"; # Make KWin use EGL Streams, because otherwise performance will be horrible. "__GL_SYNC_TO_VBLANK" = toValue cfg.proprietary.vsync;
}; "__GL_THREADED_OPTIMIZATIONS" = toValue generalCfg.unsafeOptimizations;
"KWIN_DRM_USE_EGL_STREAMS" = "1"; # Make KWin use EGL Streams, because otherwise performance will be horrible.
}; };
};
} }