diff --git a/machines/macintosh/default.nix b/machines/macintosh/default.nix
index 1eda878..e7913ce 100644
--- a/machines/macintosh/default.nix
+++ b/machines/macintosh/default.nix
@@ -29,6 +29,15 @@
 
   hardware.video.hidpi.enable = true;
 
+  programs.fish.shellInit = ''
+    if test -z (pgrep ssh-agent)
+    eval (ssh-agent -c) > /dev/null
+    set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK
+    set -Ux SSH_AGENT_PID $SSH_AGENT_PID
+    set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK
+    end
+  '';
+
   services.tailscale.enable = true;
   networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.