diff --git a/files/.config/fish/functions/nvm.fish b/files/.config/fish/functions/nvm.fish
index 90a6977..244dbb1 100644
--- a/files/.config/fish/functions/nvm.fish
+++ b/files/.config/fish/functions/nvm.fish
@@ -1,3 +1,3 @@
 function nvm
-    bass source $NVM_DIR/nvm.sh ';' nvm $argv
+    bax source $NVM_DIR/nvm.sh ';' nvm $argv
 end
diff --git a/install/00-apt-pkglist b/install/00-apt-pkglist
index 6c3ed9e..d32a4d8 100644
--- a/install/00-apt-pkglist
+++ b/install/00-apt-pkglist
@@ -1,5 +1,5 @@
 apt-transport-https
-batcat
+bat
 curl
 fd-find
 git
@@ -14,3 +14,4 @@ ripgrep
 ruby-full
 software-properties-common
 tmux
+universal-ctags
diff --git a/install/16-vim.sh b/install/16-vim.sh
index f1e20b8..aaaf908 100755
--- a/install/16-vim.sh
+++ b/install/16-vim.sh
@@ -11,7 +11,8 @@ fi
 
 echo "Installing neovim support";
 pip3 install --user neovim pynvim 'python-language-server[all]'
-yarn global add neovim
+nvm use default
+npm install -g neovim
 sudo gem install neovim
 
 echo "Running PlugInstall";