nixos: use enable for ssh_config units

nix-community · Dec 25, 2021 · c92001a · c92001a
1 parent 8615a85
commit c92001a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/nixos/default.nix b/nixos/default.nix
@@ -168,26 +168,27 @@ in {
       ++ lib.optional cfg.useUserPackages "/etc/profile.d";
 
     systemd.services = mapAttrs' (_: usercfg:
-      let username = usercfg.home.username;
-      in nameValuePair "ssh_config-${utils.escapeSystemdPath username}" (lib.mkIf usercfg.programs.ssh.enable {
+      let inherit (usercfg.home) username homeDirectory;
+      in nameValuePair "ssh_config-${utils.escapeSystemdPath username}" {
+        inherit (usercfg.programs.ssh) enable;
         description = "Linking ${username}' ssh conifg";
         wantedBy = [ "multi-user.target" ];
         before = [ "systemd-user-sessions.service" ];
 
-        unitConfig = { RequiresMountsFor = usercfg.home.homeDirectory; };
+        unitConfig.RequiresMountsFor = homeDirectory;
 
         stopIfChanged = false;
 
         serviceConfig = {
-          User = usercfg.home.username;
+          User = username;
           Type = "oneshot";
           RemainAfterExit = "yes";
           TimeoutStartSec = 90;
           SyslogIdentifier = "hm-activate-${username}";
 
-          ExecStart = ["${pkgs.coreutils}/bin/ln -s ${usercfg.programs.ssh.configPath} ${usercfg.home.homeDirectory}/.ssh/config"];
+          ExecStart = ["${pkgs.coreutils}/bin/ln -s ${usercfg.programs.ssh.configPath} ${homeDirectory}/.ssh/config"];
         };
-      })) cfg.users;
+      }) cfg.users;
 
   };
 }