diff --git a/base/zshrc b/base/zshrc
index d72cdff..37c7c50 100644
--- a/base/zshrc
+++ b/base/zshrc
@@ -25,7 +25,18 @@ load_antidote()
       -f https://github.com/mattmc3/antidote.git "${ANTIDOTE_DIR}"
     git config -f .gitmodules submodule.antidote.shallow true
   }
+
+  # Plugin configurations
   zstyle ':antidote:bundle' use-friendly-names 'yes'
+  zstyle ':omz:plugins:nvm' autoload yes
+
+  # Disable ls colors to avoid issues with eza
+  export DISABLE_LS_COLORS=true
+  zstyle ':omz:plugins:eza' 'dirs-first' yes
+  zstyle ':omz:plugins:eza' 'git-status' yes
+  zstyle ':omz:plugins:eza' 'icons' yes
+  zstyle ':omz:plugins:eza' 'ls' yes
+  zstyle ':omz:plugins:eza' 'prompt' yes
 
   zsh_plugins=${ANTIDOTE_PLUGINS}
   [[ -f ${zsh_plugins}.txt ]] || touch ${zsh_plugins}.txt
@@ -51,20 +62,6 @@ load_antigen()
 
     antigen use oh-my-zsh
 
-    # Disable ls colors to avoid issues with eza
-    export DISABLE_LS_COLORS=true
-
-    export ZSH_TMUX_AUTOSTART=false
-    export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
-    export ZSH_TMUX_UNICODE=true
-    export ZSH_TMUX_AUTOQUIT=false
-    export ZSH_TMUX_DEFAULT_SESSION_NAME=main
-
-    zstyle ':omz:plugins:eza' 'dirs-first' yes
-    zstyle ':omz:plugins:eza' 'git-status' yes
-    zstyle ':omz:plugins:eza' 'icons' yes
-    zstyle ':omz:plugins:eza' 'ls' yes
-    zstyle ':omz:plugins:eza' 'prompt' yes
 
     if [[ "$OSTYPE" == darwin* ]]; then
       zstyle :omz:plugins:ssh-agent keychain yes
diff --git a/config/exports b/config/exports
index 96cfd4e..5c4376a 100755
--- a/config/exports
+++ b/config/exports
@@ -474,6 +474,12 @@ export TF_PLUGIN_CACHE_DIR="$XDG_CACHE_HOME/terraform/plugin-cache"
 # https://tmux.github.io/
 msg "Setting up tmux configuration"
 export TMUX_CONF="$XDG_CONFIG_HOME/tmux/tmux.conf"
+## These settings are for zsh-tmux
+export ZSH_TMUX_AUTOSTART=false
+export ZSH_TMUX_CONFIG="$DOTFILES/config/tmux/tmux.conf"
+export ZSH_TMUX_UNICODE=true
+export ZSH_TMUX_AUTOQUIT=false
+export ZSH_TMUX_DEFAULT_SESSION_NAME=main
 
 # tms, https://github.com/jrmoulton/tmux-sessionizer
 export TMS_CONFIG_FILE="${XDG_CONFIG_HOME}/tms/config.toml"
@@ -485,6 +491,7 @@ x-dc "$WAKATIME_HOME"
 
 # Misc
 msg "Setting up miscellaneous configuration"
+export ZSHZ_DATA="$XDG_STATE_HOME/z"
 export CHEAT_USE_FZF=true
 export SQLITE_HISTORY="${XDG_CACHE_HOME}/sqlite_history"
 
diff --git a/config/nvm/default-packages b/config/nvm/default-packages
new file mode 100644
index 0000000..0f572fc
--- /dev/null
+++ b/config/nvm/default-packages
@@ -0,0 +1,5 @@
+# $NVM_DIR/default-packages
+
+yarn
+neovim
+corepack
diff --git a/config/zsh/antidote_plugins.txt b/config/zsh/antidote_plugins.txt
index 8b7ec46..98fb5e5 100644
--- a/config/zsh/antidote_plugins.txt
+++ b/config/zsh/antidote_plugins.txt
@@ -13,8 +13,9 @@ ohmyzsh/ohmyzsh path:plugins/colored-man-pages  # load OMZ plugins
 
 ohmyzsh/ohmyzsh path:plugins/colored-man-pages
 ohmyzsh/ohmyzsh path:plugins/extract
-ohmyzsh/ohmyzsh path:plugins/z
 ohmyzsh/ohmyzsh path:plugins/eza
+ohmyzsh/ohmyzsh path:plugins/tmux
+ohmyzsh/ohmyzsh path:plugins/z
 
 # Add some programmer plugins
 ohmyzsh/ohmyzsh path:plugins/git
@@ -23,7 +24,6 @@ ohmyzsh/ohmyzsh path:plugins/python
 ohmyzsh/ohmyzsh path:plugins/nvm
 
 # Add core plugins that make Zsh a bit more like Fish
-zsh-users/zsh-completions path:src kind:fpath
 zdharma-continuum/fast-syntax-highlighting
 
 # Add some plugins that are not in OMZ