From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 25 Oct 2022 09:55:36 +0000 (+0100)
Subject: Fuck gpg-agent directly
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=023600839acf7dbdc53f019219f3bd3d059224dc;p=max%2Fsaltfiles.git

Fuck gpg-agent directly
---

diff --git a/states/zsh/arch.sls b/states/zsh/arch.sls
index 84051df..5b57626 100644
--- a/states/zsh/arch.sls
+++ b/states/zsh/arch.sls
@@ -4,3 +4,4 @@ install zsh:
       - zsh
       - zsh-completions
       - python-virtualenvwrapper
+      - keychain
diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc
index 57c58ec..22f0b65 100644
--- a/states/zsh/files/zshrc
+++ b/states/zsh/files/zshrc
@@ -50,18 +50,7 @@ precmd () {
 	__git_ps1 "" "$(virtual_env)${p}" "${NEWLINE}[%s]${NEWLINE}"
 }
 
-
-if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
-  gpg-connect-agent /bye >/dev/null 2>&1
-fi
-
-unset SSH_AGENT_PID
-if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-fi
-
-
-gpg-connect-agent updatestartuptty /bye > /dev/null
+eval $(keychain --agents gpg,ssh --eval --quiet --noask id_ed25519 B3030EB2 F0C471E6)
 
 bindkey '^R' history-incremental-search-backward