From 5abca15f2119077dcfb0253d196b32bf37d6c322 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Sun, 19 Feb 2017 22:46:47 -0900
Subject: bumblebee service: Fix pmMethod bbswitch check

Made useBbswitch work when pmMethod is "auto" and removed invalid pmMethod option "nouveau".
---
 nixos/modules/hardware/video/bumblebee.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nixos/modules/hardware/video/bumblebee.nix')

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.
         '';
-- 
cgit 1.4.1