From db11e59933860639baa6d58ec05125de545baae6 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@rak.ac>
Date: Thu, 30 Jul 2026 08:24:26 -0400
Subject: fix ssh-agent launching yet again

---
 dot_config/systemd/user/symlink_gcr-ssh-agent.socket | 1 +
 dot_zshrc.tmpl                                       | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)
 create mode 100644 dot_config/systemd/user/symlink_gcr-ssh-agent.socket

diff --git a/dot_config/systemd/user/symlink_gcr-ssh-agent.socket b/dot_config/systemd/user/symlink_gcr-ssh-agent.socket
new file mode 100644
index 0000000..dc1dc0c
--- /dev/null
+++ b/dot_config/systemd/user/symlink_gcr-ssh-agent.socket
@@ -0,0 +1 @@
+/dev/null
\ No newline at end of file
diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
index 3ec6d8b..eb09aa3 100644
--- a/dot_zshrc.tmpl
+++ b/dot_zshrc.tmpl
@@ -587,12 +587,7 @@ NO_verbose		\
 # GPG / SSH AGENT
 
 if command -v keychain > /dev/null && test -d ~/.ssh/keys/{{ .chezmoi.hostname }}; then
-    keychain --inherit any ~/.ssh/keys/{{ .chezmoi.hostname }}/id_*[^p][^u][^b]
-    [ -z "$HOSTNAME" ] && HOSTNAME=`uname -n`
-    [ -f $HOME/.keychain/$HOSTNAME-sh ] &&
-           . $HOME/.keychain/$HOSTNAME-sh
-    [ -f $HOME/.keychain/$HOSTNAME-sh-gpg ] &&
-           . $HOME/.keychain/$HOSTNAME-sh-gpg
+    keychain --ssh-allow-forwarded ~/.ssh/keys/{{ .chezmoi.hostname }}/id_*[^p][^u][^b]
 fi
 
 # vim: set ft=zsh:
-- 
cgit v1.2.3