global/ssh: setup ssh-agent, remove keychain

users/modules/global/keychain.nix

@@ -1,11 +0,0 @@
-{ config, ... }:
-{
-  services.ssh-agent.enable = true;
-
-  programs.keychain = {
-    enable = true;
-    inheritType = "any";
-    extraFlags = [ "--quiet" "--quick" "--systemd" "--dir ${config.xdg.configHome}/keychain" "--agents \"\"" ];
-    keys = [ "id_ed25519" ];
-  };
-}

users/modules/global/ssh.nix

@@ -2,6 +2,7 @@
 {
   programs.ssh = {
     enable = true;
+    addKeysToAgent = "yes";
     controlMaster = "auto";
     controlPersist = "1m";
     matchBlocks = {
@@ -10,4 +11,6 @@
       };
     };
   };
+
+  services.ssh-agent.enable = true;
 }