From 9e8b2642b4b42f03200b5d7155ce57fab247c118 Mon Sep 17 00:00:00 2001
From: Andrejus <hi@andrejus.uk>
Date: Mon, 9 Nov 2020 19:33:17 +0000
Subject: [PATCH] Fix nvm and vim installation, update pkglist

---
 files/.config/nvim/base.vim | 12 ------------
 install/00-apt-pkglist      |  4 ++--
 install/13-nvm.sh           |  4 ++--
 install/16-vim.sh           |  6 +++---
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/files/.config/nvim/base.vim b/files/.config/nvim/base.vim
index 6217ff5..12509ac 100644
--- a/files/.config/nvim/base.vim
+++ b/files/.config/nvim/base.vim
@@ -64,18 +64,6 @@ endif
 set nobackup
 set nowritebackup
 
-" Don't pass messages to |ins-completion-menu|.
-set shortmess+=c
-
-" Always show the signcolumn, otherwise it would shift the text each time
-" diagnostics appear/become resolved.
-if has("patch-8.1.1564")
-  " Recently vim can merge signcolumn and number column into one
-  set signcolumn=number
-else
-  set signcolumn=yes
-endif
-
 " ============================================================================ "
 " ===                                UI                                    === "
 " ============================================================================ "
diff --git a/install/00-apt-pkglist b/install/00-apt-pkglist
index 9911034..6c3ed9e 100644
--- a/install/00-apt-pkglist
+++ b/install/00-apt-pkglist
@@ -1,7 +1,7 @@
 apt-transport-https
-bat
+batcat
 curl
-fdfind
+fd-find
 git
 gnupg2
 jq
diff --git a/install/13-nvm.sh b/install/13-nvm.sh
index bcdbf8a..58e9729 100755
--- a/install/13-nvm.sh
+++ b/install/13-nvm.sh
@@ -17,8 +17,8 @@ if not_installed "nvm"; then
 fi
 
 printf "nvm is installed, upgrading...\n"
-git --git-dir="$NVM_DIR/.git" fetch -q
-git --git-dir="$NVM_DIR/.git" rebase -q --autostash FETCH_HEAD
+run "https://raw.githubusercontent.com/nvm-sh/nvm/v0.36.0/install.sh" \
+    "bash"
 
 nvm --version
 nvm use node
diff --git a/install/16-vim.sh b/install/16-vim.sh
index 999aa1d..f1e20b8 100755
--- a/install/16-vim.sh
+++ b/install/16-vim.sh
@@ -10,10 +10,10 @@ if [ ! -f $plug_target ]; then
 fi
 
 echo "Installing neovim support";
-export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring && pip3 install --user neovim pynvim 'python-language-server[all]'
-npm install -g neovim elm-format
+pip3 install --user neovim pynvim 'python-language-server[all]'
+yarn global add neovim
 sudo gem install neovim
 
 echo "Running PlugInstall";
-nvim --headless +PlugClean! +PlugInstall +PlugUpgrade +PlugUpdate +qall
+nvim --headless +UpdateRemotePlugins +PlugClean! +PlugInstall +PlugUpgrade +PlugUpdate +qall
 nvim --version