diff --git a/configs/client.nix b/configs/client.nix
index de63298..fd0c567 100644
--- a/configs/client.nix
+++ b/configs/client.nix
@@ -7,11 +7,4 @@
     yt-dlp
     hyfetch
   ];
-
-  hm.programs.keychain = {
-    enable = true;
-    agents = ["ssh"];
-    inheritType = "any";
-    keys = ["id_ed25519"];
-  };
 }
diff --git a/configs/common.nix b/configs/common.nix
index 65f58e6..3117fea 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -55,7 +55,17 @@ in {
     };
   };
 
-  hm.home = {inherit stateVersion;};
+  hm = {
+    home = {inherit stateVersion;};
+
+    programs.ssh = {
+      enable = true;
+      addKeysToAgent = "yes";
+      forwardAgent = true;
+    };
+
+    services.ssh-agent.enable = true;
+  };
 
   home-manager = {
     useGlobalPkgs = true;
@@ -107,8 +117,6 @@ in {
   };
 
   programs = {
-    ssh.startAgent = true;
-
     direnv.enable = true;
 
     nix-ld.enable = true;
diff --git a/configs/desktop.nix b/configs/desktop.nix
index 7edc60b..d9c7f16 100644
--- a/configs/desktop.nix
+++ b/configs/desktop.nix
@@ -87,13 +87,6 @@
       ];
     };
 
-    services = {
-      gpg-agent = {
-        enable = true;
-        pinentryPackage = pkgs.pinentry-gnome3;
-      };
-    };
-
     xdg.enable = true;
     gtk.enable = true;
   };
@@ -111,11 +104,6 @@
   };
 
   programs = {
-    gnupg.agent = {
-      enable = true;
-      pinentryPackage = pkgs.pinentry-gnome3;
-    };
-
     firefox.enable = true;
     steam.enable = true;
     virt-manager.enable = true;
diff --git a/programs/fish.nix b/programs/fish.nix
index d748ab1..ead5f94 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -11,6 +11,8 @@
     enable = true;
 
     interactiveShellInit = with pkgs; ''
+      ssh-add -l | grep -q (ssh-keygen -lf ~/.ssh/id_ed25519) || ssh-add ~/.ssh/id_ed25519
+
       ${lib.getExe starship} init fish | source
       ${lib.getExe nix-your-shell} fish | source
     '';