summary refs log tree commit diff
path: root/nixos/modules/hardware/video/bumblebee.nix
diff options
context:
space:
mode:
authorzraexy <zraexy@users.noreply.github.com>2017-02-19 22:46:47 -0900
committerGitHub <noreply@github.com>2017-02-19 22:46:47 -0900
commit5abca15f2119077dcfb0253d196b32bf37d6c322 (patch)
tree9fcb2f8b5ec52a1c366fdc955e6321cdecad1635 /nixos/modules/hardware/video/bumblebee.nix
parentc23c2c50ded3e1dd3e7e30ba4f29142c84d0aca3 (diff)
downloadnixpkgs-5abca15f2119077dcfb0253d196b32bf37d6c322.tar
nixpkgs-5abca15f2119077dcfb0253d196b32bf37d6c322.tar.gz
nixpkgs-5abca15f2119077dcfb0253d196b32bf37d6c322.tar.bz2
nixpkgs-5abca15f2119077dcfb0253d196b32bf37d6c322.tar.lz
nixpkgs-5abca15f2119077dcfb0253d196b32bf37d6c322.tar.xz
nixpkgs-5abca15f2119077dcfb0253d196b32bf37d6c322.tar.zst
nixpkgs-5abca15f2119077dcfb0253d196b32bf37d6c322.zip
bumblebee service: Fix pmMethod bbswitch check
Made useBbswitch work when pmMethod is "auto" and removed invalid pmMethod option "nouveau".
Diffstat (limited to 'nixos/modules/hardware/video/bumblebee.nix')
-rw-r--r--nixos/modules/hardware/video/bumblebee.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index 3967137fcf8..2278c7b4061 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -13,7 +13,7 @@ let
     useDisplayDevice = cfg.connectDisplay;
   };
 
-  useBbswitch = cfg.pmMethod == "bbswitch";
+  useBbswitch = cfg.pmMethod == "bbswitch" || cfg.pmMethod == "auto" && useNvidia;
 
   primus = pkgs.primus.override {
     inherit useNvidia;
@@ -65,7 +65,7 @@ in
 
       pmMethod = mkOption {
         default = "auto";
-        type = types.enum [ "auto" "bbswitch" "nouveau" "switcheroo" "none" ];
+        type = types.enum [ "auto" "bbswitch" "switcheroo" "none" ];
         description = ''
           Set preferred power management method for unused card.
         '';