summary refs log tree commit diff stats
path: root/tag-zsh/config
diff options
context:
space:
mode:
authorAlan Pearce2015-06-14 13:08:13 +0200
committerAlan Pearce2015-06-14 13:08:13 +0200
commit5e035aaca2cef803d51964a15f08702275f2431e (patch)
tree8d4194f387dbedf4617dc2643ed017fcfaf41b83 /tag-zsh/config
parent0f6186dfd2369dd8df402736ea2e53f88961c24c (diff)
parentd4b0fd75e2025156375f4535aa802447a375d504 (diff)
downloadnixfiles-5e035aaca2cef803d51964a15f08702275f2431e.tar.lz
nixfiles-5e035aaca2cef803d51964a15f08702275f2431e.tar.zst
nixfiles-5e035aaca2cef803d51964a15f08702275f2431e.zip
Merge branch 'master' of github.com:alanpearce/dotfiles
Diffstat (limited to 'tag-zsh/config')
-rwxr-xr-xtag-zsh/config/zsh/zshenv18
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