git

modules/applications/ssh/home.nix

@@ -20,16 +20,10 @@ in
           pkgs.openssh
         ];
 
-        systemd.user.services.ssh-agent = {
-          Unit.Description = "OpenSSH authentication agent";
-          Service = {
-            ExecStart = "${pkgs.openssh}/bin/ssh-agent -D -a %t/ssh-agent";
-          };
-          Install.WantedBy = [ "default.target" ];
-        };
-
         systemd.user.sockets.gcr-ssh-agent.Install.WantedBy = lib.mkForce [ ];
 
+        services.ssh-agent.enable = true;
+
         home.sessionVariables = {
           SSH_AUTH_SOCK = "\${XDG_RUNTIME_DIR}/ssh-agent";
         };

modules/applications/ssh/system.nix

@@ -16,5 +16,8 @@ in
     environment.systemPackages = with pkgs; [
       openssh # OpenSSH client and server
     ];
+
+    programs.ssh.startAgent = true;
+    services.gnome.gcr-ssh-agent.enable = false;
   };
 }