diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-06-04 15:25:41 +0200 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-06-10 12:06:42 +0200 |
| commit | e40abba1ed43b7cc73632a52771159249913ff46 (patch) | |
| tree | 2881285de52e89e183d2fce146c6031d963af3e9 /nixos | |
| parent | 7b75a79581cfa1cfd676b5b85d6a8ed772635c13 (diff) | |
nixos/nvidia: minor cleanups
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/hardware/video/nvidia.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 3caec769400cb..f866bbe17643c 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -275,7 +275,7 @@ in softdep nvidia post: nvidia-uvm ''; }; - systemd.tmpfiles.rules = lib.optional config.virtualisation.docker.enableNvidia "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin"; + systemd.tmpfiles.rules = lib.mkIf config.virtualisation.docker.enableNvidia "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin"; services.udev.extraRules = '' # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'" @@ -290,6 +290,7 @@ in }; environment.systemPackages = [ nvidia_x11.bin ]; }) + # X11 (lib.mkIf nvidiaEnabled { assertions = [ @@ -455,6 +456,7 @@ in extraPackages = [ pkgs.nvidia-vaapi-driver ]; extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ]; }; + environment.systemPackages = lib.optional cfg.nvidiaSettings nvidia_x11.settings ++ lib.optional cfg.nvidiaPersistenced nvidia_x11.persistenced @@ -527,16 +529,12 @@ in }; }) ]; + services.acpid.enable = true; services.dbus.packages = lib.optional cfg.dynamicBoost.enable nvidia_x11.bin; - hardware.firmware = - let - isOpen = cfg.open; - isNewUnfree = lib.versionAtLeast nvidia_x11.version "555"; - in - lib.optional (isOpen || isNewUnfree) nvidia_x11.firmware; + hardware.firmware = lib.optional (cfg.open || lib.versionAtLeast nvidia_x11.version "555") nvidia_x11.firmware; systemd.tmpfiles.rules = [ |