diff --git a/Brewfile b/Brewfile
index 0993268..6ad2e16 100644
--- a/Brewfile
+++ b/Brewfile
@@ -75,7 +75,7 @@ brew "git-crypt"
 
 # Node & NPM / NVM
 brew "node"
-brew "nvm"
+# brew "nvm"
 
 # Mostly ordinary binaries
 brew "amazon-ecs-cli"
@@ -258,6 +258,7 @@ cask "visual-studio"
 cask "docker"
 cask "virtualbox"
 cask "virtualbox-extension-pack"
+cask "vagrant"
 cask "vmware-fusion"
 
 # Media
diff --git a/macos/brew-cask.sh b/macos/brew-cask.sh
index 53d1cff..4b4975a 100755
--- a/macos/brew-cask.sh
+++ b/macos/brew-cask.sh
@@ -69,6 +69,7 @@ brew cask install visual-studio
 brew cask install docker
 brew cask install virtualbox
 brew cask install virtualbox-extension-pack
+brew cask install vagrant
 brew cask install vmware-fusion
 
 
diff --git a/macos/brew.sh b/macos/brew.sh
index 2df1361..f35738f 100755
--- a/macos/brew.sh
+++ b/macos/brew.sh
@@ -82,7 +82,7 @@ brew install git-crypt
 
 # Node & NPM / NVM
 brew install node
-brew install nvm
+# brew install nvm
 
 # mtr (better ping & traceroute)
 brew install mtr
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 3af06ae..12b37e8 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,5 +1,5 @@
 # Path to cloned dotfiles repo
-export DOTFILES=$HOME/.dotfiles/zsh
+export DOTFILES=$HOME/.dotfiles
 
 # Path to oh-my-zsh installation
 export ZSH=$HOME/.oh-my-zsh
@@ -14,7 +14,7 @@ HISTSIZE=10000
 SAVEHIST=10000
 
 # Oh My ZSH settings
-ZSH_CUSTOM=$DOTFILES
+ZSH_CUSTOM=$DOTFILES/zsh
 ZSH_THEME="agnoster"
 plugins=(
   colorize
@@ -23,6 +23,14 @@ plugins=(
   zsh-autosuggestions
 )
 
+# https://gist.github.com/ctechols/ca1035271ad134841284
+#autoload -Uz compinit
+#if [ $(date +'%j') != $(stat -f '%Sm' -t '%j' ~/.zcompdump) ]; then
+#  compinit
+#else
+#  compinit -C
+#fi
+
 # Load everything!
 source $ZSH/oh-my-zsh.sh
 
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index e06a5b4..1001c86 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -32,7 +32,7 @@ alias speed="wget -O /dev/null http://cachefly.cachefly.net/100mb.test"
 alias digg="dig @8.8.8.8 +nocmd any +multiline +noall +answer"
 
 # Update: brew, npm, gem, macos
-alias update="brew update; brew upgrade; brew cask upgrade; brew cleanup; nvm install node --latest-npm --reinstall-packages-from=node; npm install npm -g; npm update -g; gem update --system; gem update; gem cleanup; sudo gem update --system; sudo gem update; sudo gem cleanup; sudo softwareupdate -ia --include-config-data;"
+alias update="brew update; brew upgrade; brew cask upgrade; brew cleanup; npm install npm -g; npm update -g; gem update --system; gem update; gem cleanup; sudo gem update --system; sudo gem update; sudo gem cleanup; sudo softwareupdate -ia --include-config-data;"
 
 alias rehide="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
 alias unhide="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
diff --git a/zsh/path.zsh b/zsh/path.zsh
index 346ba64..3773d50 100644
--- a/zsh/path.zsh
+++ b/zsh/path.zsh
@@ -8,7 +8,7 @@ export PATH="$PATH:$GOPATH/bin"
 export PATH="$PATH:$GOROOT/bin"
 
 # Ruby
-export PATH="/usr/local/opt/ruby/bin:$PATH"
+#export PATH="/usr/local/opt/ruby/bin:$PATH"
 
 # Metasploit
 export PATH="/opt/metasploit-framework/bin:$PATH"
@@ -22,19 +22,7 @@ export PATH="$HOME/.cargo/bin:$PATH"
 
 # ----- Third-party additions below: -----
 
-# pyenv
-eval "$(pyenv init -)"
-
-# rbenv
-eval "$(rbenv init -)"
-
-# nvm
-export NVM_DIR="$HOME/.nvm"
-# [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-# [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-# This is SOOOOOOOO SLOW.... lazy-load nvm instead with `usenvm`:
-alias usenvm='[ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"; [ -s "/usr/local/opt/nvm/etc/bash_completion" ] && . "/usr/local/opt/nvm/etc/bash_completion"'
-
+#eval "$(rbenv init -)"
 
 # The next line updates PATH for the Google Cloud SDK.
 if [ -f '/Users/jake/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/jake/google-cloud-sdk/path.zsh.inc'; fi