From 47b10a4fe17a44741de1fb9a13e6798c3a375221 Mon Sep 17 00:00:00 2001
From: Adam Hellberg <sharparam@sharparam.com>
Date: Wed, 23 Mar 2022 19:52:43 +0100
Subject: [PATCH] Revert to using GPG for SSH on all hosts

---
 zsh/.zshrc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/zsh/.zshrc b/zsh/.zshrc
index a84f4e5..ed0e10e 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -234,17 +234,17 @@ if [[ $is_wsl ]]; then
   wsl-gpg-proxy
   wsl-ssh-proxy
 else
-  if [ "$HOST" = "melina" ]; then
-    if ! pgrep -u "$USER" ssh-agent > /dev/null; then
-      ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env"
-    fi
-    if [[ ! "$SSH_AUTH_SOCK" ]]; then
-      source "$XDG_RUNTIME_DIR/ssh-agent.env" > /dev/null
-    fi
-  else
-    unset SSH_AGENT_PID
-    export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-  fi
+  #if [ "$HOST" = "melina" ]; then
+  #  if ! pgrep -u "$USER" ssh-agent > /dev/null; then
+  #    ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env"
+  #  fi
+  #  if [[ ! "$SSH_AUTH_SOCK" ]]; then
+  #    source "$XDG_RUNTIME_DIR/ssh-agent.env" > /dev/null
+  #  fi
+  #else
+  unset SSH_AGENT_PID
+  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+  #fi
   gpgconf --launch gpg-agent
 fi
 
-- 
2.54.0