zsh: set PINENTRY_USER_DATA in zshenv

It should affect all shells, not just interractive ones.

diff --git a/zsh/lib/gpg.zsh b/zsh/lib/gpg.zsh
index b1274163c445918d41a2d3e5a623d1e0104e9074..7b977d40eb8275720b5165fe146ef1bb62125c42 100644 (file)
--- a/zsh/lib/gpg.zsh
+++ b/zsh/lib/gpg.zsh
@@ -4,6 +4,3 @@ fi
 
 # Inform gpg-agent of the current TTY for user prompts.
 export GPG_TTY="$(tty)"
 
 # Inform gpg-agent of the current TTY for user prompts.
 export GPG_TTY="$(tty)"

-if [[ -z "$DISPLAY" ]]; then
-    export PINENTRY_USER_DATA="curses"
-fi

diff --git a/zshenv b/zshenv
index debc70022d10987838f82ac32b3b372f0d0b5c91..f0ab6332f1e17eec81f32d2afd770cd4adab08df 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -11,6 +11,11 @@ export THEME=nord
 
 # gpg
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
 
 # gpg
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"

+#TODO this should probably be set for all shells?
+if [[ -z "$DISPLAY" ]]; then
+    export PINENTRY_USER_DATA="curses"
+fi
+

 # ssh
 export SSH_AUTH_SOCK=${SSH_AUTH_SOCK:-"$XDG_RUNTIME_DIR/ssh-agent.socket"}
 
 # ssh
 export SSH_AUTH_SOCK=${SSH_AUTH_SOCK:-"$XDG_RUNTIME_DIR/ssh-agent.socket"}