diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-20 16:18:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 16:18:45 +0300 |
| commit | d8fb60d1d48f6b6a5773204c3ac05c5b7eb1e932 (patch) | |
| tree | 0ce1b72b1d325e393bb9d239d2ebe020ef4389dc /nixos/modules | |
| parent | 12b4556642d47cf79b65511061419ca9a6816856 (diff) | |
| parent | 5abca15f2119077dcfb0253d196b32bf37d6c322 (diff) | |
| download | nixlib-d8fb60d1d48f6b6a5773204c3ac05c5b7eb1e932.tar nixlib-d8fb60d1d48f6b6a5773204c3ac05c5b7eb1e932.tar.gz nixlib-d8fb60d1d48f6b6a5773204c3ac05c5b7eb1e932.tar.bz2 nixlib-d8fb60d1d48f6b6a5773204c3ac05c5b7eb1e932.tar.lz nixlib-d8fb60d1d48f6b6a5773204c3ac05c5b7eb1e932.tar.xz nixlib-d8fb60d1d48f6b6a5773204c3ac05c5b7eb1e932.tar.zst nixlib-d8fb60d1d48f6b6a5773204c3ac05c5b7eb1e932.zip | |
Merge pull request #23014 from zraexy/zraexy-bumblebee-pmmethod
bumblebee service: Fix pmMethod bbswitch check
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/hardware/video/bumblebee.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 3967137fcf8b..2278c7b40611 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. ''; |