nixos/hardware.bumblebee: remove `with lib;`

Changed files
+13 -15
nixos
modules
hardware
+13 -15
nixos/modules/hardware/video/bumblebee.nix
···
{ config, lib, pkgs, ... }:
-
-
with lib;
let
cfg = config.hardware.bumblebee;
···
options = {
hardware.bumblebee = {
-
enable = mkOption {
+
enable = lib.mkOption {
default = false;
-
type = types.bool;
+
type = lib.types.bool;
description = ''
Enable the bumblebee daemon to manage Optimus hybrid video cards.
This should power off secondary GPU until its use is requested
···
'';
};
-
group = mkOption {
+
group = lib.mkOption {
default = "wheel";
example = "video";
-
type = types.str;
+
type = lib.types.str;
description = "Group for bumblebee socket";
};
-
connectDisplay = mkOption {
+
connectDisplay = lib.mkOption {
default = false;
-
type = types.bool;
+
type = lib.types.bool;
description = ''
Set to true if you intend to connect your discrete card to a
monitor. This option will set up your Nvidia card for EDID
···
'';
};
-
driver = mkOption {
+
driver = lib.mkOption {
default = "nvidia";
-
type = types.enum [ "nvidia" "nouveau" ];
+
type = lib.types.enum [ "nvidia" "nouveau" ];
description = ''
Set driver used by bumblebeed. Supported are nouveau and nvidia.
'';
};
-
pmMethod = mkOption {
+
pmMethod = lib.mkOption {
default = "auto";
-
type = types.enum [ "auto" "bbswitch" "switcheroo" "none" ];
+
type = lib.types.enum [ "auto" "bbswitch" "switcheroo" "none" ];
description = ''
Set preferred power management method for unused card.
'';
···
};
};
-
config = mkIf cfg.enable {
+
config = lib.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.kernelModules = lib.optional useBbswitch "bbswitch";
+
boot.extraModulePackages = lib.optional useBbswitch kernel.bbswitch ++ lib.optional useNvidia kernel.nvidia_x11.bin;
environment.systemPackages = [ bumblebee primus ];