From fe9139e325151a6a90f1be1fb1ca54b8eee1c70d Mon Sep 17 00:00:00 2001 From: nnyyxxxx Date: Sun, 15 Sep 2024 22:21:22 -0400 Subject: [PATCH 1/2] Move configuration setup outside of setup functions --- tabs/applications-setup/alacritty-setup.sh | 6 +++++- tabs/applications-setup/kitty-setup.sh | 5 +++++ tabs/applications-setup/rofi-setup.sh | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tabs/applications-setup/alacritty-setup.sh b/tabs/applications-setup/alacritty-setup.sh index 09c9e8d01..92e49d337 100755 --- a/tabs/applications-setup/alacritty-setup.sh +++ b/tabs/applications-setup/alacritty-setup.sh @@ -16,6 +16,9 @@ setupAlacritty() { else echo "alacritty is already installed." fi +} + +setupAlacrittyConfig() { echo "Copy alacritty config files" if [ -d "${HOME}/.config/alacritty" ] && [ ! -d "${HOME}/.config/alacritty-bak" ]; then cp -r "${HOME}/.config/alacritty" "${HOME}/.config/alacritty-bak" @@ -27,4 +30,5 @@ setupAlacritty() { checkEnv checkEscalationTool -setupAlacritty \ No newline at end of file +setupAlacritty +setupAlacrittyConfig \ No newline at end of file diff --git a/tabs/applications-setup/kitty-setup.sh b/tabs/applications-setup/kitty-setup.sh index 9baee95c3..d75d006bb 100755 --- a/tabs/applications-setup/kitty-setup.sh +++ b/tabs/applications-setup/kitty-setup.sh @@ -16,6 +16,9 @@ setupKitty() { else echo "Kitty is already installed." fi +} + +setupKittyConfig() { echo "Copy Kitty config files" if [ -d "${HOME}/.config/kitty" ] && [ ! -d "${HOME}/.config/kitty-bak" ]; then cp -r "${HOME}/.config/kitty" "${HOME}/.config/kitty-bak" @@ -23,8 +26,10 @@ setupKitty() { mkdir -p "${HOME}/.config/kitty/" curl -sSLo "${HOME}/.config/kitty/kitty.conf" https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/kitty.conf curl -sSLo "${HOME}/.config/kitty/nord.conf" https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/nord.conf + } checkEnv checkEscalationTool setupKitty +setupKittyConfig \ No newline at end of file diff --git a/tabs/applications-setup/rofi-setup.sh b/tabs/applications-setup/rofi-setup.sh index ef4fe2325..c58745170 100755 --- a/tabs/applications-setup/rofi-setup.sh +++ b/tabs/applications-setup/rofi-setup.sh @@ -16,6 +16,9 @@ setupRofi() { else echo "Rofi is already installed." fi +} + +setupRofiConfig() { echo "Copy Rofi config files" if [ -d "$HOME/.config/rofi" ] && [ ! -d "$HOME/.config/rofi-bak" ]; then cp -r "$HOME/.config/rofi" "$HOME/.config/rofi-bak" @@ -33,3 +36,4 @@ setupRofi() { checkEnv checkEscalationTool setupRofi +setupRofiConfig From 60dbe030613bfd968831965f534c31d42cccf7eb Mon Sep 17 00:00:00 2001 From: nnyyxxxx Date: Sun, 15 Sep 2024 22:24:28 -0400 Subject: [PATCH 2/2] Remove newline (was going to implement something but then forgot about it --- tabs/applications-setup/kitty-setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tabs/applications-setup/kitty-setup.sh b/tabs/applications-setup/kitty-setup.sh index d75d006bb..7afbbe5d8 100755 --- a/tabs/applications-setup/kitty-setup.sh +++ b/tabs/applications-setup/kitty-setup.sh @@ -26,7 +26,6 @@ setupKittyConfig() { mkdir -p "${HOME}/.config/kitty/" curl -sSLo "${HOME}/.config/kitty/kitty.conf" https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/kitty.conf curl -sSLo "${HOME}/.config/kitty/nord.conf" https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/kitty/nord.conf - } checkEnv