diff --git a/home/default.nix b/home/default.nix
index e06bd18..c188eb2 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -26,5 +26,11 @@
     shellAliases = {
       reload-home-manager-config = "home-manager switch --flake ${builtins.toString ./.}";
     };
+
+    file.".ssh/rc".text = ''
+      #!/bin/sh
+      ln -sf "$SSH_AUTH_SOCK" "$HOME/.ssh/ssh_auth_sock"
+    '';
+    file.".ssh/rc".executable = true;
   };
 }
diff --git a/home/programs/server.nix b/home/programs/server.nix
index 2003493..5716ab9 100644
--- a/home/programs/server.nix
+++ b/home/programs/server.nix
@@ -327,7 +327,6 @@
       enable = true;
 
       shellAbbrs = {
-        fix-ssh = "eval $(tmux show-env | grep ^SSH_AUTH_SOCK | sed 's/=/ /;s/^/set /')";
         diff-persist = "sudo rsync -amvxx --dry-run --no-links --exclude '/tmp/*' --exclude '/root/*' / /persist/ | rg -v '^skipping|/$'";
       };
 
@@ -398,6 +397,8 @@
 
         setw -g automatic-rename on
         set -g set-titles on
+
+        set-environment -g 'SSH_AUTH_SOCK' $HOME/.ssh/ssh_auth_sock
       '';
     };
   };