update install script

1 files changed, 11 insertions, 14 deletions

diff --git a/utils/installer/install-nv-code.sh b/utils/installer/install-nv-code.sh
index f29baa37..321ff3cc 100755
--- a/utils/installer/install-nv-code.sh
+++ b/utils/installer/install-nv-code.sh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 set -o nounset # error when referencing undefined variable
 set -o errexit # exit when command fails
 
@@ -14,6 +12,10 @@ installnodeubuntu() {
 	sudo apt install npm
 }
 
+moveoldnvim() {
+	echo "Not installing NVCode: \n Please move your ~/.config/nvim folder before installing"
+}
+
 installnodearch() {
 	sudo pacman -S nodejs
 	sudo pacman -S npm
@@ -62,17 +64,12 @@ installpacker() {
 
 cloneconfig() {
 	echo "Cloning NVCode configuration"
-	git clone https://github.com/ChristianChiarulli/nvcode.git ~/.config/nvcode
-    mv $HOME/.config/nvcode/init.lua $HOME/.config/nvcode/init.lua.tmp
-    mv $HOME/.config/nvcode/utils/init.lua $HOME/.config/nvcode/init.lua
-    mv $HOME/.config/nvcode/lua/plugins.lua $HOME/.config/nvcode/utils/plugins.lua
-    mkdir $HOME/.config/nvcode/utils/tmp/
-    mv $HOME/.config/nvcode/lua/* $HOME/.config/nvcode/utils/tmp/
-    mv $HOME/.config/nvcode/utils/plugins.lua $HOME/.config/nvcode/lua/
-	nvim -u $HOME/.config/nvcode/init.lua --headless +PackerSync +qall
-    mv $HOME/.config/nvcode/utils/tmp/* $HOME/.config/nvcode/lua/
-    rm $HOME/.config/nvcode/init.lua
-    mv $HOME/.config/nvcode/init.lua.tmp $HOME/.config/nvcode/init.lua
+	git clone https://github.com/ChristianChiarulli/nvcode.git ~/.config/nvim
+    mv $HOME/.config/nvim/init.lua $HOME/.config/nvim/init.lua.tmp
+    mv $HOME/.config/nvim/utils/init.lua $HOME/.config/nvim/init.lua
+	nvim -u $HOME/.config/nvim/init.lua --headless --noplugin +PackerInstall +qall
+    rm $HOME/.config/nvim/init.lua
+    mv $HOME/.config/nvim/init.lua.tmp $HOME/.config/nvim/init.lua
 }
 
 asktoinstallnode() {
@@ -132,7 +129,7 @@ which node >/dev/null && echo "node installed, moving on..." || asktoinstallnode
 pip3 list | grep pynvim >/dev/null && echo "pynvim installed, moving on..." || installpynvim
 
 # move old nvim directory if it exists
-# [ -d "$HOME/.config/nvim" ] && moveoldnvim
+[ -d "$HOME/.config/nvim" ] && moveoldnvim
 
 if [ -a "$HOME/.local/share/nvim/site/pack/packer/start/packer.nvim" ]; then
     echo 'packer already installed'