diff --git a/runcoms/zshrc b/runcoms/zshrc
index 799ab52..17a00aa 100644
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -10,13 +10,16 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
 
-# Use local npm prefix
+# Custom stuff
+#
 export NPM_CONFIG_PREFIX=~/.npm_prefix
-export EDITOR=vim
-export VISUAL=vim
+export EDITOR=nvim
+export VISUAL=nvim
 export PATH=$PATH:$NPM_CONFIG_PREFIX/bin
-alias ncmpcpp="ncmpcpp -c ~/.config/ncmpcpp/config"
 
+alias ncmpcpp="ncmpcpp -c ~/.config/ncmpcpp/config"
+alias vi=nvim
+alias vim=nvim
 
 searchpkg () {
   nix-env -qaP '*' --description | grep $1