From 916b4e75d718461e2e75243ce5f4a018e199812e Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@acscott.dev>
Date: Sun, 23 Oct 2022 17:15:32 -0400
Subject: [PATCH] Updated install.sh

---
 install.sh | 40 ++++++++++------------------------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/install.sh b/install.sh
index 47ca93e..8c74269 100755
--- a/install.sh
+++ b/install.sh
@@ -14,32 +14,9 @@ exec 1>$log_file 2>&1
 
 ## Backup current files and folders
 mkdir -p $backup
-cp -a ~/.bash_profile $backup/
-cp -a ~/.bashrc $backup/
-cp -a ~/.profile $backup/
-cp -a ~/.emacs $backup/
-cp -a ~/.emacs.d $backup/
-cp -a ~/.Xresources $backup/
-cp -a $config_dir/bspwm $backup/
-cp -a $config_dir/dunst $backup/
-cp -a $config_dir/kitty $backup/
-cp -a $config_dir/nvim $backup/
-cp -a $config_dir/polybar $backup/
-cp -a $bin_dir $backup/
-
-# Delete current files and folders
-rm -rf ~/.bash_profile
-rm -rf ~/.bashrc
-rm -rf ~/.profile
-rm -rf ~/.emacs
-rm -rf ~/.emacs.d
-rm -rf ~/.Xresources
-rm -rf $config_dir/bspwm
-rm -rf $config_dir/dunst
-rm -rf $config_dir/kitty
-rm -rf $config_dir/nvim
-rm -rf $config_dir/polybar
-rm -rf $bin_dir
+mv -f ~/{.bash_profile,.bashrc,.profile,.emacs,.emacs.d,.vimrc,.xinitrc,.Xresources} $backup/
+mv -f $config_dir/{bspwm,dunst,kitty,nvim,polybar,rofi,sxhkd,tint2,xsettingsd} $backup/
+mv -f $bin_dir $backup/
 
 # Create HOME symlinks
 ln -sf $dotfiles_dir/bashrc ~/.bashrc
@@ -51,11 +28,11 @@ ln -sf $dotfiles_dir/vimrc ~/.vimrc
 ln -sf $dotfiles_dir/Xresources ~/.Xresources
 
 # Create $config_dir, sub-directories, and symlinks
-mkdir -p $config_dir/{bspwm,dunst,kitty,nvim,polybar,rofi,sxhkd}
+mkdir -p $config_dir/{bspwm,dunst,kitty,nvim,polybar,rofi,tint2,sxhkd,xsettingsd}
 ln -sf $dotfiles_dir/config/bspwm/bspwmrc $config_dir/bspwm/bspwmrc
 ln -sf $dotfiles_dir/config/dunst/dunstrc $config_dir/dunst/dunstrc
 ln -sf $dotfiles_dir/config/kitty/kitty.conf $config_dir/kitty/kitty.conf
-#ln -sf $dotfiles_dir/config/kitty/gruvbox.conf $config_dir/kitty/gruvbox.conf
+ln -sf $dotfiles_dir/config/kitty/gruvbox.conf $config_dir/kitty/gruvbox.conf
 ln -sf $dotfiles_dir/config/kitty/zenburn.conf $config_dir/kitty/zenburn.conf
 ln -sf $dotfiles_dir/config/nvim/init.vim $config_dir/nvim/init.vim
 ln -sf $dotfiles_dir/config/polybar/config.ini $config_dir/polybar/config.ini
@@ -63,15 +40,18 @@ ln -sf $dotfiles_dir/config/polybar/colors.ini $config_dir/polybar/colors.ini
 ln -sf $dotfiles_dir/config/polybar/modules.ini $config_dir/polybar/modules.ini
 ln -sf $dotfiles_dir/config/polybar/custom_modules.ini $config_dir/polybar/custom_modules.ini
 ln -sf $dotfiles_dir/config/rofi/config.everforest.rasi $config_dir/rofi/config.rasi
-#ln -sf $dotfiles_dir/config/rofi/config.gruvbox.rasi $config_dir/rofi/config.rasi
-#ln -sf $dotfiles_dir/config/rofi/config.zenburn.rasi $config_dir/rofi/config.rasi
+ln -sf $dotfiles_dir/config/rofi/config.gruvbox.rasi $config_dir/rofi/config.rasi
+ln -sf $dotfiles_dir/config/rofi/config.zenburn.rasi $config_dir/rofi/config.rasi
 ln -sf $dotfiles_dir/config/sxhkd/sxhkdrc $config_dir/sxhkd/sxhkdrc
+ln -sf $dotfiles_dir/config/tint2/tint2rc $config_dir/tint2/tint2rc
+ln -sf $dotfiles_dir/config/xsettingsd/xsettingsd.conf $config_dir/xsettingsd/xsettingsd.conf
 
 # Create $bin_dir and symlinks
 mkdir -p $bin_dir
 ln -sf $dotfiles_dir/bin/mirror-outputs $bin_dir
 ln -sf $dotfiles_dir/bin/single-polybar-launcher $bin_dir
 ln -sf $dotfiles_dir/bin/toggle-wifi $bin_dir
+ln -sf $dotfiles_dir/bin/tint2-launcher $bin_dir
 
 # Finishing up
 source ~/.bashrc