diff options
| author | Alan Pearce | 2015-06-21 11:28:53 +0200 |
|---|---|---|
| committer | Alan Pearce | 2015-06-21 11:28:53 +0200 |
| commit | e02cc4654d04b7efd5232c23c26a96aff2997b0c (patch) | |
| tree | 95cdff3798a5db64c1c0c3d7aa4915c26278c539 /tag-zsh | |
| parent | b739f3f4f0a51f0656519a58c52c18909f73e46a (diff) | |
| download | nixfiles-e02cc4654d04b7efd5232c23c26a96aff2997b0c.tar.lz nixfiles-e02cc4654d04b7efd5232c23c26a96aff2997b0c.tar.zst nixfiles-e02cc4654d04b7efd5232c23c26a96aff2997b0c.zip | |
zsh: Use gpg-agent instead of envoy
Diffstat (limited to 'tag-zsh')
| -rwxr-xr-x | tag-zsh/config/zsh/zshenv | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tag-zsh/config/zsh/zshenv b/tag-zsh/config/zsh/zshenv index c23be400..95377c1a 100755 --- a/tag-zsh/config/zsh/zshenv +++ b/tag-zsh/config/zsh/zshenv @@ -66,8 +66,14 @@ then eval "$(direnv hook zsh)" fi -if [[ $os == gnu && ! -S $SSH_AUTH_SOCK && -s $commands[envoy] ]] +if [[ -s $commands[gpg-agent ]]] then - envoy -t gpg-agent - eval $(envoy -p) + envfile="$HOME/.gnupg/gpg-agent.env" + if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then + eval "$(cat "$envfile")" + else + eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")" + fi + export GPG_AGENT_INFO # the env file does not contain the export statement + export SSH_AUTH_SOCK # enable gpg-agent for ssh fi |