From 7224291b93805859edb2efe15bfe268e5b3a4c28 Mon Sep 17 00:00:00 2001
From: stephen <stev@noble-testing.lan>
Date: Sat, 2 Mar 2024 22:48:35 -0500
Subject: [PATCH] updated installation

---
 ddeps.sh    |  3 ++-
 init.sh     | 19 +++----------------
 spacevim.sh |  2 +-
 udeps.sh    |  3 ++-
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/ddeps.sh b/ddeps.sh
index bb862cc..7e43037 100755
--- a/ddeps.sh
+++ b/ddeps.sh
@@ -37,7 +37,8 @@ sudo apt-get -my install \
   nala \
   duf \
   tree \
-  vim
+  vim \
+  make
 
 read -n1 -p $'\nDoes this system need a ssh server?\n' REPLY
   if [[ $REPLY == [Yy] ]]; then
diff --git a/init.sh b/init.sh
index 758ac0a..816e083 100755
--- a/init.sh
+++ b/init.sh
@@ -74,22 +74,9 @@ git_user () {
 }
 
 #install spacevim & neovim
-spacevim () {
-  echo "Installing Spacevim!"
-  [ -d $HOME/.vim ] && mv "$HOME/.vim" "$HOME/vim_bk"
-  [ -f $HOME/.vimrc ] && mv "$HOME/.vimrc" "$HOME/vimrc_bk"
-  curl -sLf https://spacevim.org/install.sh | bash -s -- --install vim
-  echo "Install Neovim"
-  mkdir -v ~/bin
-  trash ~/bin/nvim 
-  curl -L https://github.com/neovim/neovim/releases/latest/download/nvim.appimage -o ~/bin/nvim
-  chmod u+x ~/bin/nvim
-  trash ~/.local/share/nvim #removes spacevim's symlink
-  echo "Install NvChad"
-  git clone https://github.com/NvChad/NvChad ~/.config/nvim --depth 1
-  echo "Install Lunar Vim"
-  LV_BRANCH='release-1.3/neovim-0.9' bash <(curl -s https://raw.githubusercontent.com/LunarVim/LunarVim/release-1.3/neovim-0.9/utils/installer/install.sh)
-}
+echo "Installing Spacevim & Friends!"
+bash spacevim.sh
+
 #install fonts for terminal
 fonts () {
   echo "installing fonts"
diff --git a/spacevim.sh b/spacevim.sh
index 1f99b1f..d1650e1 100755
--- a/spacevim.sh
+++ b/spacevim.sh
@@ -8,7 +8,7 @@ mkdir -v ~/bin
 trash ~/bin/nvim 
 curl -L https://github.com/neovim/neovim/releases/latest/download/nvim.appimage -o ~/bin/nvim
 chmod u+x ~/bin/nvim
-trash ~/.local/share/nvim #removes spacevim's symlink
+trash ~/.local/share/nvim ~/.config/nvim #removes spacevim's symlink
 echo "Install NvChad"
 git clone https://github.com/NvChad/NvChad ~/.config/nvim --depth 1
 echo "Install Lunar Vim"
diff --git a/udeps.sh b/udeps.sh
index 53c1f52..67c6c4e 100755
--- a/udeps.sh
+++ b/udeps.sh
@@ -35,7 +35,8 @@ sudo apt-get -my install \
   neofetch \
   trash-cli \
   nala \
-  libfuse2
+  libfuse2 \
+  make
 
 read -n1 -p $'Does this system need a ssh server?\n' REPLY
   if [[ $REPLY == [Yy] ]]; then