From 8393b057ec882f148bc1d116a15cfe57fdb229d1 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 25 May 2015 15:57:42 +0200
Subject: zsh: Run direnv hook after sourcing custom env

---
 tag-zsh/config/zsh/zshenv | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'tag-zsh/config/zsh/zshenv')

diff --git a/tag-zsh/config/zsh/zshenv b/tag-zsh/config/zsh/zshenv
index 8e1fd02..c23be40 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
-- 
cgit 1.4.1