diff --git a/home/common/ssh.nix b/home/common/ssh.nix
index 34a1b48..0979fa9 100644
--- a/home/common/ssh.nix
+++ b/home/common/ssh.nix
@@ -1,7 +1,11 @@
 { lib, ... }:
 {
   programs.ssh.enableDefaultConfig = false;
-  services.ssh-agent.enable = true;
+  programs.keychain = {
+    enable = true;
+    keys = [ "primary-vi" ];
+    enableFishIntegration = true;
+  };
 
   home.activation.writeSSHConfig = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
     rm -f $HOME/.ssh/config