diff --git a/zsh/.zshenv b/zsh/.zshenv
index a2ea0f8..cb9ec9a 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -22,6 +22,11 @@ export FZF_DEFAULT_OPTS=" \
 --color=border:#313244,label:#CDD6F4"
 export FZF_TMUX_OPTS=" -p90%,70%"
 
+case ":$PATH:" in
+  *":$HOME/.local/bin:"*) ;;
+  *) export PATH="$HOME/.local/bin:$PATH" ;;
+esac
+
 # Mise
 if command -v mise >/dev/null 2>&1; then
   eval "$(mise activate zsh)"
@@ -33,6 +38,11 @@ if command -v go >/dev/null 2>&1; then
   export GOBIN="$GOPATH/bin"
 fi
 
+# Load cargo envs
+if [ -e "$HOME/.cargo" ]; then
+  source "$HOME/.cargo/env"
+fi
+
 # Java
 if command -v java >/dev/null 2>&1; then
   export JAVA_HOME="$(dirname $(mise bin-paths | grep -i java))"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 23fd91c..d8a69bb 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -35,7 +35,7 @@ stty stop undef # disable accidental ctrl s
 # history opts
 HISTSIZE=1000000
 SAVEHIST=1000000
-# HISTFILE="$XDG_CACHE_HOME/zsh_history" # move histfile to cache
+HISTFILE="$XDG_CACHE_HOME/zsh_history" # move histfile to cache
 HISTCONTROL=ignoreboth # consecutive duplicates & commands starting with space are not saved
 
 fpath=(~/.zsh $fpath)
@@ -98,15 +98,6 @@ alias userlist="cut -d: -f1 /etc/passwd | sort"
 alias ip='ip -color'
 alias stow='stow -d $DOTFILES '
 
-case ":$PATH:" in
-  *":$HOME/.local/bin:"*) ;;
-  *) export PATH="$HOME/.local/bin:$PATH" ;;
-esac
-
-if [ -e "$HOME/.cargo" ]; then
-    source "$HOME/.cargo/env"
-fi
-
 if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then
   tmux attach-session -t default || tmux new-session -s default
 fi