diff --git a/.config/nvim b/.config/nvim
index 7a453e1..6316f11 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit 7a453e14fa87462cfaa6f8f26f82530152f82196
+Subproject commit 6316f11357083a1acb51aec267bbdd7b48030120
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 4ea9dce..0c02b8f 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,41 +1,56 @@
-#neofetch
 nitch
-#potatoe
-# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts, [y/n]
-# confirmations, etc.) must go above this block; everything else may go below.
+
 if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
     source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ${ZDOTDIR:-~}/.p10k.zsh ]] || source ${ZDOTDIR:-~}/.p10k.zsh
+
+## ADD TO /etc/zsh/zshenv
+#export ZDOTDIR="$HOME"/.config/zsh
+#. /bedrock/run/zprofile
+
 export XDG_DATA_HOME=$HOME/.local/share
 export XDG_CONFIG_HOME=$HOME/.config
-export XDG_STATE_HOME=$HOME/.localse/state
+export XDG_STATE_HOME=$HOME/.local/state
 export XDG_CACHE_HOME=$HOME/.cache
 
+export CABAL_CONFIG="$XDG_CONFIG_HOME"/cabal/config
+export CABAL_DIR="$XDG_DATA_HOME"/cabal
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
+export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
+export GOPATH="$XDG_DATA_HOME"/go
+export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+export XCURSOR_PATH=/usr/share/icons:${XDG_DATA_HOME}/icons
+export LESSHISTFILE="$XDG_STATE_HOME"/less/history
+export NIMBLE_DIR="$XDG_DATA_HOME/nimble"
+export NODE_REPL_HISTORY="$XDG_DATA_HOME"/node_repl_history
+export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
+export PSQL_HISTORY="$XDG_DATA_HOME/psql_history"
+export W3M_DIR="$XDG_DATA_HOME"/w3m
+export WINEPREFIX="$XDG_DATA_HOME"/wine
+export HISTFILE="$XDG_STATE_HOME"/zsh/history
+
 export KUBECONFIG=$(find ~/.kube/configs -type f -printf '%p:')
 export USE_GKE_GCLOUD_AUTH_PLUGIN=True
 export EDITOR=nvim
 export LIBVA_DRIVER_NAME=nvidia
-
-export LESSHISTFILE=$XDG_STATE_HOME/less/history
-export NIMBLE_DIR=$XDG_DATA_HOME/nimble
-export CARGO_HOME=$XDG_DATA_HOME/cargo
-export GOPATH=$XDG_DATA_HOME/go
-export GOBIN=$GOPATH/bin
-export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
-export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
-
 PATH="$PATH:/home/abs3nt/.local/bin"
 PATH="$PATH:/home/abs3nt/.local/lib/python3.9/site-packages"
 PATH="$PATH:/home/abs3nt/.cargo/bin"
-PATH="$PATH:$GOBIN"
+PATH="$PATH:$XDG_DATA_HOME/go/bin"
 PATH="$PATH:/usr/lib/node_modules/npm"
 PATH="$PATH:/usr/local/opt/openjdk/libexec/openjdk.jdk/Contents/Home/bin"
 PATH="$PATH:/home/abs3nt/.nimble/bin"
 
+# PATH
+# set in ~/.profile
+
 # ZSH SETTINGS
-export HISTFILE=$XDG_STATE_HOME/zsh/history
 HISTSIZE=10000
 SAVEHIST=10000
 setopt appendhistory
@@ -59,46 +74,42 @@ __git_files () {
 }
 
 # PLUGINS
-zinit ice lucid wait'0'
 zinit ice depth=1; zinit light romkatv/powerlevel10k
-zinit light zsh-users/zsh-autosuggestions
-zinit light zsh-users/zsh-history-substring-search
-zinit light z-shell/F-Sy-H
-zinit load z-shell/H-S-MW
-
 # append completions to fpath
 fpath=(/bedrock/share/zsh/completion /bedrock/cross/zsh-completion $fpath)
-# initialise completions with ZSH's compinit
-autoload -Uz compinit && compinit
 
-compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+zinit wait lucid light-mode for \
+  atload'_zsh_autosuggest_start' zsh-users/zsh-autosuggestions \
+  joshskidmore/zsh-fzf-history-search \
+  hlissner/zsh-autopair \
+  zsh-users/zsh-history-substring-search \
+  z-shell/F-Sy-H \
+  djui/alias-tips
+
+zi for \
+    atload"zicompinit; zicdreplay" \
+    blockf \
+    lucid \
+    wait \
+  zsh-users/zsh-completions
 
 # ALIASES
-
-for f in $XDG_CONFIG_HOME/zsh/aliases/*; do source $f; done
-
-source <(haunt completion zsh) && compdef _haunt haunt
+for file in $XDG_CONFIG_HOME/zsh/aliases/* ; do
+  source "$file"
+done
 
 # KEYBINDING
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
-bindkey '^r' _atuin_search_widget
 
 # PLUGIN SETTINGS
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND=false
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND=false
 HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=true
 
+export ZSH_FZF_HISTORY_SEARCH_REMOVE_DUPLICATES=1
+export ZSH_FZF_HISTORY_SEARCH_DATES_IN_SEARCH=0
+export ZSH_FZF_HISTORY_SEARCH_EVENT_NUMBERS=0
+
 eval "$(dircolors)"
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
-
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
-[[ ! -f ${ZDOTDIR:-~}/.p10k.zsh ]] || source ${ZDOTDIR:-~}/.p10k.zsh
-
-# The next line updates PATH for the Google Cloud SDK.
-if [ -f '/home/abs3nt/Dev/google-cloud-sdk/path.zsh.inc' ]; then . '/home/abs3nt/Dev/google-cloud-sdk/path.zsh.inc'; fi
-
-# The next line enables shell command completion for gcloud.
-if [ -f '/home/abs3nt/Dev/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/abs3nt/Dev/google-cloud-sdk/completion.zsh.inc'; fi
-export ATUIN_NOBIND="true"
-eval "$(atuin init zsh)"