diff --git a/zsh/environment/host/zuk/zshenv b/zsh/environment/host/zuk/zshenv
index 38ee3c7..f5bf30a 100644
--- a/zsh/environment/host/zuk/zshenv
+++ b/zsh/environment/host/zuk/zshenv
@@ -1,7 +1,6 @@
 export GOPATH="$HOME/Code/go"
 GOLANG_PATH="/usr/lib/go/bin"
-DOOM_BIN="$HOME/.emacs.d/bin"
-export PATH="$DOOM_BIN:$GOPATH/bin/:$GOLANG_PATH:$PATH"
+export PATH="$GOPATH/bin/:$GOLANG_PATH:$PATH"
 
 export EMACS_FRAMEWORK="doom"
 
diff --git a/zsh/zshenv b/zsh/zshenv
index 40eb051..351fe1e 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -77,8 +77,12 @@ if [ -d $user_script_dir ] ; then
   PATH="$user_script_dir:$PATH"
 fi
 
-
 env_loader zshenv
 
+if [ $EMACS_FRAMEWORK = 'doom' ]; then
+  DOOM_BIN="$HOME/.emacs.d/bin"
+  export PATH="$DOOM_BIN:$PATH"
+fi
+
 # Dedup path.
 typeset -gU path