From a78d0d6538b6e8386f8b59cc79700d2182b79f73 Mon Sep 17 00:00:00 2001
From: shokinn <mail@philip-henning.com>
Date: Tue, 29 Dec 2020 23:11:33 +0100
Subject: [PATCH] Change to new ssh-agend bridge

---
 dotfiles/zshenv_win | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dotfiles/zshenv_win b/dotfiles/zshenv_win
index 63c0b99..5d25724 100644
--- a/dotfiles/zshenv_win
+++ b/dotfiles/zshenv_win
@@ -17,7 +17,20 @@ if [ -d "$HOME/.local/bin" ] ; then
 fi
 
 # Connect to windows ssh pageant
-eval $(/mnt/c/weasel-pageant/weasel-pageant -rb -a $HOME/.weasel-pageant.sock)
+export SSH_AUTH_SOCK=$HOME/.ssh/agent.sock
+ss -a | grep -q $SSH_AUTH_SOCK
+if [ $? -ne 0 ]; then
+        rm -f $SSH_AUTH_SOCK
+        (setsid nohup socat UNIX-LISTEN:$SSH_AUTH_SOCK,fork EXEC:$HOME/.ssh/wsl2-ssh-pageant.exe >/dev/null 2>&1 &)
+fi
+
+# Connect to windows gpg agent
+export GPG_AGENT_SOCK=$HOME/.gnupg/S.gpg-agent
+ss -a | grep -q $GPG_AGENT_SOCK
+if [ $? -ne 0 ]; then
+        rm -rf $GPG_AGENT_SOCK
+        (setsid nohup socat UNIX-LISTEN:$GPG_AGENT_SOCK,fork EXEC:"$HOME/.ssh/wsl2-ssh-pageant.exe --gpg S.gpg-agent" >/dev/null 2>&1 &)
+fi
 
 # X410 (Windows X11 Server)
 export DISPLAY=$(cat /etc/resolv.conf | grep nameserver | awk '{print $2; exit;}'):0.0