diff options
Diffstat (limited to 'krebs/3modules/systemd.nix')
| -rw-r--r-- | krebs/3modules/systemd.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/krebs/3modules/systemd.nix b/krebs/3modules/systemd.nix index 3e524d3b..57620155 100644 --- a/krebs/3modules/systemd.nix +++ b/krebs/3modules/systemd.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: let { - lib = import ../../lib; +{ config, pkgs, lib, ... }: let { body.options.krebs.systemd.services = lib.mkOption { default = {}; @@ -13,14 +12,14 @@ lib.sort lib.lessThan (lib.filter - lib.types.absolute-pathname.check + pkgs.stockholm.lib.types.absolute-pathname.check (map - (lib.compose [ lib.maybeHead (lib.match "[^:]*:(.*)") ]) + (pkgs.stockholm.lib.compose [ pkgs.stockholm.lib.maybeHead (pkgs.stockholm.lib.match "[^:]*:(.*)") ]) (lib.toList cfg.serviceConfig.LoadCredential))); readOnly = true; }; credentialUnitName = lib.mkOption { - default = "trigger-${lib.systemd.encodeName serviceName}"; + default = "trigger-${pkgs.stockholm.lib.systemd.encodeName serviceName}"; readOnly = true; }; restartIfCredentialsChange = lib.mkOption { @@ -54,7 +53,7 @@ pkgs.systemd ]} - cache=/var/lib/credentials/${lib.shell.escape serviceName}.sha1sum + cache=/var/lib/credentials/${pkgs.stockholm.lib.shell.escape serviceName}.sha1sum tmpfile=$(mktemp -t "$(basename "$cache")".XXXXXXXX) trap 'rm -f "$tmpfile"' EXIT @@ -64,7 +63,7 @@ fi mv "$tmpfile" "$cache" - systemctl restart ${lib.shell.escape serviceName} + systemctl restart ${pkgs.stockholm.lib.shell.escape serviceName} ''; }; }; |