diff --git a/config/zsh/.zshenv b/config/zsh/.zshenv
index 74a0338..209ab42 100644
--- a/config/zsh/.zshenv
+++ b/config/zsh/.zshenv
@@ -1,14 +1,16 @@
 #shellcheck disable=SC2034
 
 skip_global_compinit=1
-export XDG_CACHE_HOME=/tmp/${USER}-cache
-export XDG_CONFIG_HOME=$HOME/.config
-export XDG_DATA_HOME=$HOME/.local/share
-export XDG_STATE_HOME=$HOME/.local/state
-export HISTFILE=$XDG_DATA_HOME/zsh/history
+export XDG_CACHE_HOME="/tmp/${USER}-cache"
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_DATA_HOME="${HOME}/.local/share"
+export XDG_STATE_HOME="${HOME}/.local/state"
+export ZDOTDIR="${XDG_CONFIG_HOME}/zsh"
+export HISTFILE="${XDG_DATA_HOME}/zsh/history"
 export HISTSIZE=10000
 export SAVEHIST=$HISTSIZE
 
+rm -rf "${ZDOTDIR}/.zsh_history" && ln -sf "${XDG_DATA_HOME}/zsh/history" "${ZDOTDIR}/.zsh_history"
 # clean home - needs to be here for Docker Desktop
 export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
 export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index d6044b4..1aa8af8 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -16,7 +16,6 @@ setopt HIST_SAVE_NO_DUPS
 setopt HIST_REDUCE_BLANKS
 setopt SHARE_HISTORY
 setopt INC_APPEND_HISTORY
-rm -rf "${ZDOTDIR}/.zsh_history" && ln -sf "${XDG_DATA_HOME}/zsh/history" "${ZDOTDIR}/.zsh_history"
 
 # set path
 path=(~/.local/bin "${path[@]}")
@@ -42,9 +41,6 @@ if [[ $(command -v vivid) ]]; then
 else
   unset LS_COLORS
 fi
-# if [ "$TERM_PROGRAM" != "Apple_Terminal" ]; then
-#   eval "$(oh-my-posh --config "${XDG_CONFIG_HOME}/omp/omp.toml" init zsh)"
-# fi
 source "${ZDOTDIR}/p10k.zsh"
 source ~/.local/git/zsh_modules/powerlevel10k/powerlevel10k.zsh-theme
 if [[ -r "${XDG_CACHE_HOME}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then