summary refs log tree commit diff
path: root/nixos/modules/hardware
diff options
context:
space:
mode:
authorBernardo Meurer <bernardo@meurer.org>2021-08-30 16:23:57 -0700
committerBernardo Meurer <bernardo@meurer.org>2021-08-30 17:06:07 -0700
commit7b2709f6a4b4b56f802b6ea09740baf99e06ee60 (patch)
tree5614710f95072b9b8e306bde0c928112466045bf /nixos/modules/hardware
parent197a496c7f2e5959ab4ce3b9d96cf9f2fc0e93f7 (diff)
downloadnixpkgs-7b2709f6a4b4b56f802b6ea09740baf99e06ee60.tar
nixpkgs-7b2709f6a4b4b56f802b6ea09740baf99e06ee60.tar.gz
nixpkgs-7b2709f6a4b4b56f802b6ea09740baf99e06ee60.tar.bz2
nixpkgs-7b2709f6a4b4b56f802b6ea09740baf99e06ee60.tar.lz
nixpkgs-7b2709f6a4b4b56f802b6ea09740baf99e06ee60.tar.xz
nixpkgs-7b2709f6a4b4b56f802b6ea09740baf99e06ee60.tar.zst
nixpkgs-7b2709f6a4b4b56f802b6ea09740baf99e06ee60.zip
nixos/nvidia: let user choose whether to install nvidia-settings
Diffstat (limited to 'nixos/modules/hardware')
-rw-r--r--nixos/modules/hardware/video/nvidia.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 1e125eced2c..73d3451c71c 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -143,6 +143,15 @@ in
       '';
     };
 
+    hardware.nvidia.nvidiaSettings = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Whether to add nvidia-settings, NVIDIA's GUI configuration tool, to
+        systemPackages.
+      '';
+    };
+
     hardware.nvidia.nvidiaPersistenced = mkOption {
       default = false;
       type = types.bool;
@@ -279,7 +288,8 @@ in
     hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out;
     hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32;
 
-    environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
+    environment.systemPackages = [ nvidia_x11.bin ]
+      ++ optionals nvidiaSettings [ nvidia_x11.settings ]
       ++ optionals nvidiaPersistencedEnabled [ nvidia_x11.persistenced ];
 
     systemd.packages = optional cfg.powerManagement.enable nvidia_x11.out;