From b2662e91dcfa9390f10011c0e5f06b20c0da24dc Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 11 Aug 2018 22:19:22 -0400 Subject: [PATCH] bumblebee: allow the use of different driver versions --- nixos/modules/hardware/video/bumblebee.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index 2278c7b406117..9919ff91a2f14 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -55,6 +55,14 @@ in ''; }; + package = mkOption { + default = kernel.nvidia_x11; + type = types.package; + description = '' + Name of the driver package to use + ''; + }; + driver = mkOption { default = "nvidia"; type = types.enum [ "nvidia" "nouveau" ]; @@ -77,7 +85,7 @@ in config = mkIf cfg.enable { boot.blacklistedKernelModules = [ "nvidia-drm" "nvidia" "nouveau" ]; boot.kernelModules = optional useBbswitch "bbswitch"; - boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia kernel.nvidia_x11.bin; + boot.extraModulePackages = optional useBbswitch kernel.bbswitch ++ optional useNvidia cfg.package.bin; environment.systemPackages = [ bumblebee primus ];