nixos/services.mbpfan: remove `with lib;`

1 files changed, 27 insertions, 29 deletions

diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix
index 1d9b7ae87ca0..3061f68bb6e2 100644
--- a/nixos/modules/services/misc/mbpfan.nix
+++ b/nixos/modules/services/misc/mbpfan.nix
@@ -1,55 +1,53 @@
 { config, lib, pkgs, ... }:
-with lib;
-
 let
   cfg = config.services.mbpfan;
-  verbose = optionalString cfg.verbose "v";
+  verbose = lib.optionalString cfg.verbose "v";
   format = pkgs.formats.ini {};
   cfgfile = format.generate "mbpfan.ini" cfg.settings;
 
 in {
   options.services.mbpfan = {
-    enable = mkEnableOption "mbpfan, fan controller daemon for Apple Macs and MacBooks";
-    package = mkPackageOption pkgs "mbpfan" {};
+    enable = lib.mkEnableOption "mbpfan, fan controller daemon for Apple Macs and MacBooks";
+    package = lib.mkPackageOption pkgs "mbpfan" {};
 
-    verbose = mkOption {
-      type = types.bool;
+    verbose = lib.mkOption {
+      type = lib.types.bool;
       default = false;
       description = "If true, sets the log level to verbose.";
     };
 
-    aggressive = mkOption {
-      type = types.bool;
+    aggressive = lib.mkOption {
+      type = lib.types.bool;
       default = true;
       description = "If true, favors higher default fan speeds.";
     };
 
-    settings = mkOption {
+    settings = lib.mkOption {
       default = {};
       description = "INI configuration for Mbpfan.";
-      type = types.submodule {
+      type = lib.types.submodule {
         freeformType = format.type;
 
-        options.general.low_temp = mkOption {
-          type = types.int;
+        options.general.low_temp = lib.mkOption {
+          type = lib.types.int;
           default = (if cfg.aggressive then 55 else 63);
-          defaultText = literalExpression "55";
+          defaultText = lib.literalExpression "55";
           description = "If temperature is below this, fans will run at minimum speed.";
         };
-        options.general.high_temp = mkOption {
-          type = types.int;
+        options.general.high_temp = lib.mkOption {
+          type = lib.types.int;
           default = (if cfg.aggressive then 58 else 66);
-          defaultText = literalExpression "58";
+          defaultText = lib.literalExpression "58";
           description = "If temperature is above this, fan speed will gradually increase.";
         };
-        options.general.max_temp = mkOption {
-          type = types.int;
+        options.general.max_temp = lib.mkOption {
+          type = lib.types.int;
           default = (if cfg.aggressive then 78 else 86);
-          defaultText = literalExpression "78";
+          defaultText = lib.literalExpression "78";
           description = "If temperature is above this, fans will run at maximum speed.";
         };
-        options.general.polling_interval = mkOption {
-          type = types.int;
+        options.general.polling_interval = lib.mkOption {
+          type = lib.types.int;
           default = 1;
           description = "The polling interval.";
         };
@@ -58,15 +56,15 @@ in {
   };
 
   imports = [
-    (mkRenamedOptionModule [ "services" "mbpfan" "pollingInterval" ] [ "services" "mbpfan" "settings" "general" "polling_interval" ])
-    (mkRenamedOptionModule [ "services" "mbpfan" "maxTemp" ] [ "services" "mbpfan" "settings" "general" "max_temp" ])
-    (mkRenamedOptionModule [ "services" "mbpfan" "lowTemp" ] [ "services" "mbpfan" "settings" "general" "low_temp" ])
-    (mkRenamedOptionModule [ "services" "mbpfan" "highTemp" ] [ "services" "mbpfan" "settings" "general" "high_temp" ])
-    (mkRenamedOptionModule [ "services" "mbpfan" "minFanSpeed" ] [ "services" "mbpfan" "settings" "general" "min_fan1_speed" ])
-    (mkRenamedOptionModule [ "services" "mbpfan" "maxFanSpeed" ] [ "services" "mbpfan" "settings" "general" "max_fan1_speed" ])
+    (lib.mkRenamedOptionModule [ "services" "mbpfan" "pollingInterval" ] [ "services" "mbpfan" "settings" "general" "polling_interval" ])
+    (lib.mkRenamedOptionModule [ "services" "mbpfan" "maxTemp" ] [ "services" "mbpfan" "settings" "general" "max_temp" ])
+    (lib.mkRenamedOptionModule [ "services" "mbpfan" "lowTemp" ] [ "services" "mbpfan" "settings" "general" "low_temp" ])
+    (lib.mkRenamedOptionModule [ "services" "mbpfan" "highTemp" ] [ "services" "mbpfan" "settings" "general" "high_temp" ])
+    (lib.mkRenamedOptionModule [ "services" "mbpfan" "minFanSpeed" ] [ "services" "mbpfan" "settings" "general" "min_fan1_speed" ])
+    (lib.mkRenamedOptionModule [ "services" "mbpfan" "maxFanSpeed" ] [ "services" "mbpfan" "settings" "general" "max_fan1_speed" ])
   ];
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     boot.kernelModules = [ "coretemp" "applesmc" ];
     environment.systemPackages = [ cfg.package ];
     environment.etc."mbpfan.conf".source = cfgfile;