diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
index 2a1c81a..5fafc49 100644
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -22,7 +22,8 @@ fish_add_path -g /opt/homebrew/sbin
 {{- end }}
 
 {{- if eq .machine "server" }}
-# Server-specific: Helix runtime
+# Server-specific: SSH key caching and Helix runtime
+keychain --eval --quiet id_ed25519 | source
 set -gx HELIX_RUNTIME /usr/local/lib/helix/runtime
 {{- end }}