From 836d1d8d8c9ff9cf6f1279a4cd9a070a9cba942f Mon Sep 17 00:00:00 2001
From: TiagoRG <tiago.rgarcia@ua.pt>
Date: Tue, 5 Mar 2024 12:17:36 +0000
Subject: [PATCH] Setup update

Signed-off-by: TiagoRG <tiago.rgarcia@ua.pt>
---
 .stow-local-ignore |  2 ++
 setup.sh           | 16 +++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.stow-local-ignore b/.stow-local-ignore
index a618634..472c49a 100644
--- a/.stow-local-ignore
+++ b/.stow-local-ignore
@@ -21,3 +21,5 @@ _darcs
 ^/LICENSE.*
 ^/COPYING
 # -------------------------
+
+setup.sh
diff --git a/setup.sh b/setup.sh
index 458ca35..1b61930 100644
--- a/setup.sh
+++ b/setup.sh
@@ -12,18 +12,15 @@ if [ "$(pwd)" != "$HOME/.dotfiles" ]; then
     cd "$HOME/.dotfiles" || exit
 fi
 
-# Setup stow
-echo -e "\e[32m$1\e[0mSetting up stow"
-stow -t "$HOME" -d "$HOME/.dotfiles" dotfiles
-
 # Setup Vim
 echo -e "\e[32m$1\e[0mSetting up Vim"
 echo -e "\e[32m$1\e[0mInstalling OneDark theme"
-curl -fLo "$HOME/.vim/colors/onedark.vim" --create-dirs "https://raw.githubusercontent.com/joshdick/onedark.vim/master/colors/onedark.vim"
-curl -fLo "$HOME/.vim/autoload/onedark.vim" --create-dirs "https://raw.githubusercontent.com/joshdick/onedark.vim/master/autoload/onedark.vim"
+curl -fLo "$HOME/.dotfiles/.vim/colors/onedark.vim" --create-dirs "https://raw.githubusercontent.com/joshdick/onedark.vim/master/colors/onedark.vim"
+curl -fLo "$HOME/.dotfiles/.vim/autoload/onedark.vim" --create-dirs "https://raw.githubusercontent.com/joshdick/onedark.vim/master/autoload/onedark.vim"
 echo -e "\e[32m$1\e[0mInstalling Copilot"
-git clone "https://github.com/github/copilot.vim.git" "$HOME/.vim/pack/github/start/copilot.vim"
+git clone "https://github.com/github/copilot.vim.git" "$HOME/.dotfiles/.vim/pack/github/start/copilot.vim"
 echo -e "\e[32m$1\e[0mSetting up Copilot"
+stow -d "$HOME/.dotfiles" "$HOME"
 /bin/vim -c 'Copilot setup' -c 'qa!'
 
 # Setup Neovim
@@ -32,6 +29,7 @@ echo -e "\e[32m$1\e[0mInstalling Packer"
 git clone --depth 1 "https://github.com/wbthomason/packer.nvim" "$HOME/.local/share/nvim/site/pack/packer/start/packer.nvim"
 cd "$HOME/.dotfiles/.config/nvim" || exit
 echo -e "\e[32m$1\e[0mInstalling Plugins"
+stow -d "$HOME/.dotfiles" "$HOME"
 /bin/nvim --headless -c 'source lua/tiagorg/packer.lua' -c 'PackerSync' -c 'qa!'
 cd "$OLDPWD" || exit
 
@@ -39,7 +37,7 @@ cd "$OLDPWD" || exit
 echo -e "\e[32m$1\e[0mSetting up zsh"
 chsh -s /bin/zsh
 echo -e "\e[32m$1\e[0mInstalling zsh-autosuggestions"
-git clone "https://github.com/zsh-users/zsh-autosuggestions.git" "$HOME/.zsh/zsh-autosuggestions"
+git clone "https://github.com/zsh-users/zsh-autosuggestions.git" "$HOME/.dotfiles/.zsh/zsh-autosuggestions"
 echo -e "\e[32m$1\e[0mInstalling zsh-syntax-highlighting"
-git clone "https://github.com/zsh-users/zsh-syntax-highlighting.git" "$HOME/.zsh/zsh-syntax-highlighting"
+git clone "https://github.com/zsh-users/zsh-syntax-highlighting.git" "$HOME/.dotfiles/.zsh/zsh-syntax-highlighting"