From 049a82f4e7c6be261f733dccbfb9dd428b0ee555 Mon Sep 17 00:00:00 2001
From: nnyyxxxx <nnyyxxxx@users.noreply.github.com>
Date: Thu, 19 Sep 2024 19:11:10 -0400
Subject: [PATCH] Fix both fastfetch and alacritty

---
 tabs/applications-setup/alacritty-setup.sh |  4 ++-
 tabs/applications-setup/fastfetch-setup.sh | 41 ++++++++++++++--------
 2 files changed, 30 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 tabs/applications-setup/fastfetch-setup.sh

diff --git a/tabs/applications-setup/alacritty-setup.sh b/tabs/applications-setup/alacritty-setup.sh
index 9f974fd45..ed3d49c59 100755
--- a/tabs/applications-setup/alacritty-setup.sh
+++ b/tabs/applications-setup/alacritty-setup.sh
@@ -32,12 +32,14 @@ setupAlacrittyConfig() {
         if [ -d "${HOME}/.config/alacritty" ] && [ ! -d "${HOME}/.config/alacritty-bak" ]; then
             cp -r "${HOME}/.config/alacritty" "${HOME}/.config/alacritty-bak"
         fi
+        printf "%b\n" "${GREEN}Alacritty configuration files backed up.${RC}"
+    else
+        printf "%b\n" "${GREEN}Skipping backup of Alacritty configuration files.${RC}"
     fi
     mkdir -p "${HOME}/.config/alacritty/"
     curl -sSLo "${HOME}/.config/alacritty/alacritty.toml" "https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/alacritty/alacritty.toml"
     curl -sSLo "${HOME}/.config/alacritty/keybinds.toml" "https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/alacritty/keybinds.toml"
     curl -sSLo "${HOME}/.config/alacritty/nordic.toml" "https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/alacritty/nordic.toml"
-    printf "%b\n" "${GREEN}Alacritty configuration files backed up.${RC}"
 }
 
 checkEnv
diff --git a/tabs/applications-setup/fastfetch-setup.sh b/tabs/applications-setup/fastfetch-setup.sh
old mode 100644
new mode 100755
index dd6ca483a..6fa26f7a3
--- a/tabs/applications-setup/fastfetch-setup.sh
+++ b/tabs/applications-setup/fastfetch-setup.sh
@@ -3,25 +3,38 @@
 . ../common-script.sh
 
 installFastfetch() {
-    printf "%b\n" "${YELLOW}Installing Fastfetch...${RC}"
-    if ! command_exists fastfetch; then
-        case "$PACKAGER" in
-            pacman)
-                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm fastfetch
-                ;;
-            *)
-                "$ESCALATION_TOOL" "$PACKAGER" install -y fastfetch
-                ;;
-        esac
+    printf "%b" "${YELLOW}Do you want to install Fastfetch? (Y/n): ${RC}"
+    read -r install_choice
+    if [ "$install_choice" != "n" ] && [ "$install_choice" != "N" ]; then
+        printf "%b\n" "${YELLOW}Installing Fastfetch...${RC}"
+        if ! command_exists fastfetch; then
+            case "$PACKAGER" in
+                pacman)
+                    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm fastfetch
+                    ;;
+                *)
+                    "$ESCALATION_TOOL" "$PACKAGER" install -y fastfetch
+                    ;;
+            esac
+        else
+            printf "%b\n" "${GREEN}Fastfetch is already installed.${RC}"
+        fi
     else
-        printf "%b\n" "${GREEN}Fastfetch is already installed.${RC}"
+        printf "%b\n" "${GREEN}Skipping Fastfetch installation.${RC}"
     fi
 }
 
 setupFastfetchConfig() {
-    printf "%b\n" "${YELLOW}Copying Fastfetch config files...${RC}"
-    if [ -d "${HOME}/.config/fastfetch" ] && [ ! -d "${HOME}/.config/fastfetch-bak" ]; then
-        cp -r "${HOME}/.config/fastfetch" "${HOME}/.config/fastfetch-bak"
+    printf "%b" "${YELLOW}Do you want to backup existing Fastfetch configuration files? (Y/n): ${RC}"
+    read -r backup_choice
+    if [ "$backup_choice" != "n" ] && [ "$backup_choice" != "N" ]; then
+        printf "%b\n" "${YELLOW}Backing up existing Fastfetch configuration files...${RC}"
+        if [ -d "${HOME}/.config/fastfetch" ] && [ ! -d "${HOME}/.config/fastfetch-bak" ]; then
+            cp -r "${HOME}/.config/fastfetch" "${HOME}/.config/fastfetch-bak"
+        fi
+        printf "%b\n" "${GREEN}Fastfetch configuration files backed up.${RC}"
+    else
+        printf "%b\n" "${GREEN}Skipping backup of Fastfetch configuration files.${RC}"
     fi
     mkdir -p "${HOME}/.config/fastfetch/"
     curl -sSLo "${HOME}/.config/fastfetch/config.jsonc" https://raw.githubusercontent.com/ChrisTitusTech/mybash/main/config.jsonc