diff options
| author | Alan Pearce | 2015-05-25 15:57:42 +0200 |
|---|---|---|
| committer | Alan Pearce | 2015-05-25 15:57:42 +0200 |
| commit | 8393b057ec882f148bc1d116a15cfe57fdb229d1 (patch) | |
| tree | faaca718f4bdb01c0f4156eacc014ee09cd185ca /tag-zsh/config/zsh/zshenv | |
| parent | 7be9eeb3b614256a2c7492d0a8dd9cf5db784083 (diff) | |
| download | nixfiles-8393b057ec882f148bc1d116a15cfe57fdb229d1.tar.lz nixfiles-8393b057ec882f148bc1d116a15cfe57fdb229d1.tar.zst nixfiles-8393b057ec882f148bc1d116a15cfe57fdb229d1.zip | |
zsh: Run direnv hook after sourcing custom env
Diffstat (limited to 'tag-zsh/config/zsh/zshenv')
| -rwxr-xr-x | tag-zsh/config/zsh/zshenv | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tag-zsh/config/zsh/zshenv b/tag-zsh/config/zsh/zshenv index 8e1fd025..c23be400 100755 --- a/tag-zsh/config/zsh/zshenv +++ b/tag-zsh/config/zsh/zshenv @@ -51,23 +51,23 @@ esac export os -if [[ -s $commands[direnv] ]] +if [[ -f $ZDOTDIR/zshenv.local ]] then - eval "$(direnv hook zsh)" + . $ZDOTDIR/zshenv.local fi -if [[ $os == gnu && ! -S $SSH_AUTH_SOCK && -s $commands[envoy] ]] +if [[ -f $ZDOTDIR/zshenv.private ]] then - envoy -t gpg-agent - eval $(envoy -p) + . $ZDOTDIR/zshenv.private fi -if [[ -f $ZDOTDIR/zshenv.local ]] +if [[ -s $commands[direnv] ]] then - . $ZDOTDIR/zshenv.local + eval "$(direnv hook zsh)" fi -if [[ -f $ZDOTDIR/zshenv.private ]] +if [[ $os == gnu && ! -S $SSH_AUTH_SOCK && -s $commands[envoy] ]] then - . $ZDOTDIR/zshenv.private + envoy -t gpg-agent + eval $(envoy -p) fi |