nixos/systemd: simplify hooks function

1 files changed, 6 insertions, 6 deletions

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index f93f3f83594f..14a4ab596b52 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -503,8 +503,8 @@ in
     environment.systemPackages = [ cfg.package ];
 
     environment.etc = let
-      # generate contents for /etc/systemd/${scope}-${type} from attrset of links and packages
-      hooks = scope: type: links: pkgs.runCommand "${scope}-${type}" {
+      # generate contents for /etc/systemd/${dir} from attrset of links and packages
+      hooks = dir: links: pkgs.runCommand "${dir}" {
           preferLocalBuild = true;
           packages = cfg.packages;
       } ''
@@ -512,7 +512,7 @@ in
         mkdir -p $out
         for package in $packages
         do
-          for hook in $package/lib/systemd/${scope}-${type}/*
+          for hook in $package/lib/systemd/${dir}/*
           do
             ln -s $hook $out/
           done
@@ -562,9 +562,9 @@ in
         ${cfg.sleep.extraConfig}
       '';
 
-      "systemd/user-generators" = { source = hooks "user" "generators" cfg.user.generators; };
-      "systemd/system-generators" = { source = hooks "system" "generators" cfg.generators; };
-      "systemd/system-shutdown" = { source = hooks "system" "shutdown" cfg.shutdown; };
+      "systemd/user-generators" = { source = hooks "user-generators" cfg.user.generators; };
+      "systemd/system-generators" = { source = hooks "system-generators" cfg.generators; };
+      "systemd/system-shutdown" = { source = hooks "system-shutdown" cfg.shutdown; };
     });
 
     services.dbus.enable = true;