From ec6601ff2a4c0466161639c556ce0c23eb8c35eb Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Mon, 28 Feb 2022 16:38:45 -0800
Subject: [PATCH] Clean up install and uninstall

---
 Makefile           | 10 ++++++----
 vim-sync-append.sh | 13 +++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 85954bb..b5dc7a0 100644
--- a/Makefile
+++ b/Makefile
@@ -20,15 +20,17 @@ install-language-servers:
 .PHONY: uninstall
 uninstall:
 	rm ~/.vimrc
-	rm ~/.nvimrc
 	rm -fr ~/.vim
-	rm -fr ~/.nvim
 	rm -fr ~/.config/nvim
 
 .PHONY: clean
 clean:
-	rm -fr ./vim/plugged
-	rm -fr ./vim/autoload/plug.vim
+	# Clean vim-plug
+	rm -fr ./vim/plugged ./vim/autoload/plug.vim
+	# Clean LspInstall
+	rm -fr ~/.local/share/nvim/lsp_servers
+	# Clean Packer
+	rm -fr ~/.local/share/nvim/site/pack/packer
 
 # Installs pre-commit hooks
 $(PRE_COMMIT_ENV):
diff --git a/vim-sync-append.sh b/vim-sync-append.sh
index b435847..fb6d326 100755
--- a/vim-sync-append.sh
+++ b/vim-sync-append.sh
@@ -24,14 +24,15 @@ mkdir -p "${XDG_CONFIG_HOME:=$HOME/.config}"
 # Install all bundles
 echo "Install all bundles"
 if hash nvim 2>/dev/null; then
-    echo "If using Neovim, install the python modules in your environment"
-    nvim --headless -c PlugInstall -c qall
-    nvim --headless -c "autocmd User PackerComplete quitall" -c "PackerBootstrap" -c "PackerSync"
-    nvim --headless -c "lua require('plugins.treesitter').bootstrap()" -c quitall
-    nvim --headless -c "TSUpdateSync" -c "quitall"
+  # Install plugins for old Neovim (<0.5)
+  nvim --headless -c PlugInstall -c qall
+  # Install plugins for new Neovim (>0.5)
+  nvim --headless -c "autocmd User PackerComplete quitall" -c "PackerBootstrap" -c "PackerSync"
+  nvim --headless -c "lua require('plugins.treesitter').bootstrap()" -c quitall
+  nvim --headless -c "TSUpdateSync" -c "quitall"
 fi
 if hash vim 2>/dev/null; then
-    vim +PlugInstall +qall
+  vim +PlugInstall +qall
 fi