diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
index 5fafc49..2c812ae 100644
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -27,6 +27,11 @@ keychain --eval --quiet id_ed25519 | source
 set -gx HELIX_RUNTIME /usr/local/lib/helix/runtime
 {{- end }}
 
+{{- if ne .machine "macbook" }}
+# SSH agent socket (systemd user service)
+set -gx SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket
+{{- end }}
+
 # GPG TTY for signing
 set -gx GPG_TTY (tty)