diff --git a/nixos/modules/services/monitoring/apcupsd.nix b/nixos/modules/services/monitoring/apcupsd.nix index 09cf593f5d5e..21b27cb3f520 100644 --- a/nixos/modules/services/monitoring/apcupsd.nix +++ b/nixos/modules/services/monitoring/apcupsd.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.apcupsd; @@ -58,7 +55,7 @@ let rm "$out/apcupsd.conf" # Set the SCRIPTDIR= line in apccontrol to the dir we're creating now sed -i -e "s|^SCRIPTDIR=.*|SCRIPTDIR=$out|" "$out/apccontrol" - '' + concatStringsSep "\n" (map eventToShellCmds eventList) + '' + lib.concatStringsSep "\n" (map eventToShellCmds eventList) ); @@ -87,9 +84,9 @@ in services.apcupsd = { - enable = mkOption { + enable = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = '' Whether to enable the APC UPS daemon. apcupsd monitors your UPS and permits orderly shutdown of your computer in the event of a power @@ -99,14 +96,14 @@ in ''; }; - configText = mkOption { + configText = lib.mkOption { default = '' UPSTYPE usb NISIP 127.0.0.1 BATTERYLEVEL 50 MINUTES 5 ''; - type = types.lines; + type = lib.types.lines; description = '' Contents of the runtime configuration file, apcupsd.conf. The default settings makes apcupsd autodetect USB UPSes, limit network access to @@ -116,12 +113,12 @@ in ''; }; - hooks = mkOption { + hooks = lib.mkOption { default = {}; example = { doshutdown = "# shell commands to notify that the computer is shutting down"; }; - type = types.attrsOf types.lines; + type = lib.types.attrsOf lib.types.lines; description = '' Each attribute in this option names an apcupsd event and the string value it contains will be executed in a shell, in response to that @@ -141,10 +138,10 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { - assertion = let hooknames = builtins.attrNames cfg.hooks; in all (x: elem x eventList) hooknames; + assertion = let hooknames = builtins.attrNames cfg.hooks; in lib.all (x: lib.elem x eventList) hooknames; message = '' One (or more) attribute names in services.apcupsd.hooks are invalid. Current attribute names: ${toString (builtins.attrNames cfg.hooks)}