From 3ee484c706a35e94444e3f2dc8d2dfa7cbdb4dbb Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Sat, 24 Feb 2024 11:21:18 +0100
Subject: [PATCH] Support gcr-provided ssh agent

---
 zsh/.config/zsh/.zshrc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 362c3e4..17e0b8d 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -22,8 +22,12 @@ fi
 unset -f want_multiplexer
 
 # Check for service-managed keyring
-if [[ -z $SSH_AUTH_SOCK ]] && [[ -S $XDG_RUNTIME_DIR/ssh-agent.socket ]]; then
-	export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+if [[ -z $SSH_AUTH_SOCK ]]; then
+	if [[ -S $XDG_RUNTIME_DIR/ssh-agent.socket ]]; then
+		export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+	elif [[ -S $XDG_RUNTIME_DIR/gcr/ssh ]]; then
+		export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
+	fi
 fi
 
 #######################