From e0cd611262b9ee9c6efd3971a70cf2f18e087e62 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sat, 4 May 2024 14:32:47 -0700 Subject: [PATCH] update armin gpg --- .ssh/config | 5 +++++ scripts/machine-specific-zsh/armin.zsh | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.ssh/config b/.ssh/config index 37bc795..392f8f8 100644 --- a/.ssh/config +++ b/.ssh/config @@ -15,3 +15,8 @@ Host gul4 Host rainsllamas Hostname 129.123.107.108 + +Host wwwintmmt + Hostname www.int.mistymountainstherapy.com + ForwardAgent yes + User root diff --git a/scripts/machine-specific-zsh/armin.zsh b/scripts/machine-specific-zsh/armin.zsh index 7a7acc6..2f76739 100644 --- a/scripts/machine-specific-zsh/armin.zsh +++ b/scripts/machine-specific-zsh/armin.zsh @@ -24,9 +24,16 @@ source /Users/lizzy/.wasmer/wasmer.sh eval "$(zoxide init --cmd z zsh)" -unset SSH_AGENT_PID +# Add the following to your shell init to set up gpg-agent automatically for every shell +# Add the following to your shell init to set up gpg-agent automatically for every shell +if [ -f ~/.gnupg/.gpg-agent-info ] && [ -n "$(pgrep gpg-agent)" ]; then + source ~/.gnupg/.gpg-agent-info + export GPG_AGENT_INFO +else + eval $(gpg-agent --daemon --write-env-file ~/.gnupg/.gpg-agent-info) +fi + if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi export GPG_TTY=$(tty) -gpg-connect-agent updatestartuptty /bye >/dev/null