diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 666064d..2939999 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -218,7 +218,7 @@ autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTr
     \ quit | endif
 
 " Mirror the NERDTree before showing it. This makes it the same on all tabs.
-nnoremap <C-n> :NERDTreeMirror<CR>:NERDTreeFind<CR>
+nnoremap <C-t> :NERDTreeMirror<CR>:NERDTreeFind<CR>
 
 " Rainbow Brackets
 let g:rainbow_active = 1
@@ -268,9 +268,6 @@ tnoremap <Esc> <C-\><C-n>
 " Alt-Backspace to delete word backwards
 inoremap <M-BS> <C-w>
 
-" NerdTree bindings
-nnoremap <C-t> :NERDTreeToggle<CR>
-
 " ctrl alt up/down (Move lines)
 nnoremap <C-M-j> :m .+1<CR>==
 nnoremap <C-M-k> :m .-2<CR>==
diff --git a/.zshenv b/.zshenv
index 702a025..b27f8e1 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1,10 +1,27 @@
+# Add homebrew (multiple platforms)
+CPU=$(uname -p)
+if [[ "$CPU" == "arm" ]]; then
+  export PATH="/opt/homebrew/bin:$PATH"
+  alias oldbrew=/usr/local/bin/brew
+else
+  export PATH="/usr/local/bin:$PATH"
+fi
+
+if which ruby >/dev/null && which gem >/dev/null; then
+  PATH="$(ruby -r rubygems -e 'puts Gem.user_dir')/bin:$PATH"
+fi
+
+export HOMEBREW_PREFIX=$(brew --prefix)
+
+export HOMEBREW_NO_INSTALL_CLEANUP=1
+
 # Brew
 if [ -d "/opt/homebrew/opt/ruby/bin" ]; then
   export PATH=/opt/homebrew/opt/ruby/bin:$PATH
   export PATH=`gem environment gemdir`/bin:$PATH
 fi
 
-export LIBRARY_PATH="$LIBRARY_PATH:$(/opt/homebrew/bin/brew --prefix)/lib"
+export LIBRARY_PATH="$LIBRARY_PATH:$HOMEBREW_PREFIX/lib"
 
 export ZSH="$HOME/.oh-my-zsh"
 export EDITOR="/opt/homebrew/bin/nvim"
@@ -12,20 +29,30 @@ export EDITOR="/opt/homebrew/bin/nvim"
 # Flutter
 export PATH=$PATH:~/sources/flutter/bin
 
+# Python
+export PATH=$(pyenv root)/shims:$PATH
+
 # Add scripts directory
 export PATH=$PATH:~/sources/scripts/
 
-# Add cargo
-export PATH=$PATH:~/.cargo/bin
-
 # Set GOPATH
 export GOPATH=~/sources/go
 
 # Rust
-source "$HOME/.cargo/env"
-
-# NVM
-export NVM_DIR="$HOME/.nvm"
-[ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"  # This loads nvm
-[ -s "/usr/local/opt/nvm/etc/bash_completion.d/nvm" ] && . "/usr/local/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
-
+source ~/.cargo/env
+export PATH=~/.cargo/bin:$PATH
+
+# Your additional kubeconfig files should be inside ~/.kube/config-files
+ADD_KUBECONFIG_FILES="$HOME/.kube/configs"
+mkdir -p "${ADD_KUBECONFIG_FILES}"OIFS="$IFS"
+IFS=$'\n'
+for kubeconfigFile in `find "${ADD_KUBECONFIG_FILES}" -type f -name "*.yml" -o -name "*.yaml"`
+do
+    export KUBECONFIG="$kubeconfigFile:$KUBECONFIG"
+done
+IFS="$OIFS"
+
+[ -s "$HOMEBREW_PREFIX/opt/nvm/nvm.sh" ] && \. "$HOMEBREW_PREFIX/opt/nvm/nvm.sh" # This loads nvm
+[ -s "$(brew --prefix)/opt/nvm/etc/bash_completion.d/nvm" ] && \. "$(brew --prefix)/opt/nvm/etc/bash_completion.d/nvm" # This loads nvm bash_completion
+
+. "$HOME/.cargo/env"
diff --git a/.zshrc b/.zshrc
index c545bff..57d000b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,17 +1,3 @@
-# Add homebrew (multiple platforms)
-CPU=$(uname -p)
-if [[ "$CPU" == "arm" ]]; then
-  export PATH="/opt/homebrew/bin:$PATH"
-  alias oldbrew=/usr/local/bin/brew
-else
-  export PATH="/usr/local/bin:$PATH"
-fi
-
-# LLVM
-export PATH="/usr/local/opt/llvm/bin:$PATH"
-export LDFLAGS="-L/usr/local/opt/llvm/lib"
-export CPPFLAGS="-I/usr/local/opt/llvm/include"
-
 # Set name of the theme to load --- if set to "random", it will
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
@@ -110,7 +96,6 @@ alias vim="nvim"
 alias note='vim ~/data/notes/$(date "+%y-%m-%d").md'
 alias vimrc="vim ~/.config/nvim/init.vim"
 
-neofetch
 if command -v pyenv 1>/dev/null 2>&1; then
   eval "$(pyenv init -)"
 fi