diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
index 2c812ae..dfbb01d 100644
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -19,6 +19,8 @@ fish_add_path -g ~/.local/bin
 # macOS-specific: Homebrew paths
 fish_add_path -g /opt/homebrew/bin
 fish_add_path -g /opt/homebrew/sbin
+# SSH agent socket (systemd user service)
+set -gx SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket
 {{- end }}
 
 {{- if eq .machine "server" }}
@@ -27,11 +29,6 @@ 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)