diff --git a/.gitmodules b/.gitmodules
index 31351d5..a12c089 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,9 @@
 [submodule "fast-syntax-highlighting"]
 	path = .zshc/plugins/fast-syntax-highlighting
 	url = https://github.com/zdharma-continuum/fast-syntax-highlighting.git
+[submodule "zsh-nvm"]
+	path = .zshc/plugins/zsh-nvm
+	url = https://github.com/lukechilds/zsh-nvm.git
+[submodule "zsh-better-npm-completion"]
+	path = .zshc/plugins/zsh-better-npm-completion
+	url = https://github.com/lukechilds/zsh-better-npm-completion.git
diff --git a/.zshc/plugins/zsh-better-npm-completion b/.zshc/plugins/zsh-better-npm-completion
new file mode 160000
index 0000000..47e5987
--- /dev/null
+++ b/.zshc/plugins/zsh-better-npm-completion
@@ -0,0 +1 @@
+Subproject commit 47e5987ca422de43784f9d76311d764f82af2717
diff --git a/.zshc/plugins/zsh-nvm b/.zshc/plugins/zsh-nvm
new file mode 160000
index 0000000..745291d
--- /dev/null
+++ b/.zshc/plugins/zsh-nvm
@@ -0,0 +1 @@
+Subproject commit 745291dcf20686ec421935f1c3f8f3a2918dd106
diff --git a/.zshrc b/.zshrc
index 79bc612..d3d3c1d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -65,12 +65,18 @@ ZSH_THEME="agnoster"
 # Would you like to use another custom folder than $ZSH/custom?
 ZSH_CUSTOM=$HOME/.zshc
 
+# zsh-nvm settings
+export NVM_COMPLETION=true
+export NVM_LAZY_LOAD=true
+export NVM_LAZY_LOAD_EXTRA_COMMANDS=('nvim')
+export NVM_AUTO_USE=true
+
 # Which plugins would you like to load?
 # Standard plugins can be found in $ZSH/plugins/
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git colored-man-pages colorize command-not-found cp pyenv pip python virtualenv virtualenvwrapper poetry-env systemd archlinux appup fast-syntax-highlighting)
+plugins=(git colored-man-pages colorize command-not-found cp pyenv pip python virtualenv virtualenvwrapper poetry-env systemd archlinux appup zsh-nvm zsh-better-npm-completion fast-syntax-highlighting)
 fpath+="${ZSH_CUSTOM:-"$ZSH/custom"}/plugins/zsh-completions/src"
 source $ZSH/oh-my-zsh.sh