From a56b9ce8d58f706be53053ebb3fe8f600bdb11fd Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Fri, 1 Mar 2024 16:35:59 -0600
Subject: [PATCH 1/4] Ensure zaneyos-backups folder gets created in no .config
 folder exists

---
 install-zaneyos.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-zaneyos.sh b/install-zaneyos.sh
index a13da71..f022a39 100755
--- a/install-zaneyos.sh
+++ b/install-zaneyos.sh
@@ -32,7 +32,7 @@ if [ -d "zaneyos" ]; then
       sleep 1
     else
       echo "Creating the backups folder & moving ZaneyOS to it."
-      mkdir .config/zaneyos-backups
+      mkdir -p .config/zaneyos-backups
       mv $HOME/zaneyos .config/zaneyos-backups/$backupname
       sleep 1
     fi

From c70965ce813a6bc77a0f42d7ce40fae022e2406a Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Fri, 1 Mar 2024 16:49:21 -0600
Subject: [PATCH 2/4] Fix battery module in waybar and fix formatting of
 install script

---
 config/home/waybar.nix | 2 +-
 install-zaneyos.sh     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/home/waybar.nix b/config/home/waybar.nix
index fc0a5a4..9a34d09 100644
--- a/config/home/waybar.nix
+++ b/config/home/waybar.nix
@@ -15,7 +15,7 @@ in with lib; {
 
       modules-center = [ "hyprland/workspaces" ] ;
       modules-left = [ "custom/startmenu" "hyprland/window" "pulseaudio" "cpu" "memory"];
-      modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "clock"  "tray" ];
+      modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "clock"  "tray" ];
 
       "hyprland/workspaces" = {
       	format = if bar-number == true then "{name}" else "{icon}";
diff --git a/install-zaneyos.sh b/install-zaneyos.sh
index f022a39..3cca79e 100755
--- a/install-zaneyos.sh
+++ b/install-zaneyos.sh
@@ -56,7 +56,7 @@ cd zaneyos
 echo "-----"
 
 installusername=$(echo $USER)
-read -p "Enter Your Username [ $installusername ]: " userName
+read -p "Enter Your Username: [ $installusername ] " userName
 if [ -z "$userName" ]; then
   userName=$(echo $USER)
 else
@@ -72,7 +72,7 @@ sed -i "/^\s*username[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$userName\"/" ./
 
 echo "-----"
 
-read -p "Enter Your New Hostname: [ hyprnix ]" hostName
+read -p "Enter Your New Hostname: [ hyprnix ] " hostName
 if [ -z "$hostName" ]; then
   hostName="hyprnix"
 fi
@@ -80,7 +80,7 @@ sed -i "/^\s*hostname[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$hostName\"/" ./
 
 echo "-----"
 
-read -p "Enter Your New Git Username [Can Be Full Name]: " gitUserName
+read -p "Enter Your New Git Username: [Can Be Full Name] " gitUserName
 sed -i "/^\s*gitUsername[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$gitUserName\"/" ./options.nix
 
 echo "-----"

From 870b06ea32ce24cd7e51fa744e0ed2c60d6c8f6b Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Fri, 1 Mar 2024 17:00:32 -0600
Subject: [PATCH 3/4] Ensure wallsetter script doesn't eat up memory or cpu if
 wallpaper dir not setup properly

---
 config/scripts/wallsetter.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/scripts/wallsetter.nix b/config/scripts/wallsetter.nix
index f1d0760..4b2c746 100644
--- a/config/scripts/wallsetter.nix
+++ b/config/scripts/wallsetter.nix
@@ -12,15 +12,16 @@ pkgs.writeShellScriptBin "wallsetter" ''
   if [ -d ${wallpaperDir} ]; then
     num_files=$(ls -1 ${wallpaperDir} | wc -l)
 
-    if [ "$num_files" -eq 0 ]; then
-      notify-send "The wallpaper folder is empty. Exiting Wallsetter."
-      exit
-    elif [ "$num_files" -eq 1 ]; then
-      notify-send "The wallpaper folder has only one file. Exiting Wallsetter."
+    if [ "$num_files" -lt 1 ]; then
+      notify-send -t 900 "The wallpaper folder is empty. Exiting Wallsetter."
       exit
     else
       cd ${wallpaperDir}
-      git pull
+      if [ -d ".git" ]; then
+        git pull
+      else
+      notify-send -t 900 "The wallpaper directory is expected to be a Git repository. Exiting Wallsetter."
+      exit
     fi
   else
     ${pkgs.git}/bin/git clone ${wallpaperGit} ${wallpaperDir}

From 3dbd7936f1df60fb1e455420bae8a5e493d704d5 Mon Sep 17 00:00:00 2001
From: Tyler Kelley <tylerzanekelley@gmail.com>
Date: Fri, 1 Mar 2024 17:07:51 -0600
Subject: [PATCH 4/4] Remove references to colorScheme.colors from waybar

---
 config/home/waybar.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/home/waybar.nix b/config/home/waybar.nix
index 9a34d09..fac49fe 100644
--- a/config/home/waybar.nix
+++ b/config/home/waybar.nix
@@ -196,7 +196,7 @@ in with lib; {
 	  opacity: 0.5;
 	  transition: ${betterTransition};
 	'' else if simplebar == true then ''
-	  color: #${config.colorScheme.colors.base03};
+	  color: #${palette.base03};
           background: #${palette.base00};   
 	  margin: 4px 3px;
 	  opacity: 1;
@@ -260,7 +260,7 @@ in with lib; {
 	  opacity: 0.8;
 	  transition: ${betterTransition};
 	'' else if simplebar == true then ''
-	  color: #${config.colorScheme.colors.base05};
+	  color: #${palette.base05};
 	  border: 0px;
 	  border-radius: 15px;
 	  transition: ${betterTransition};