From b557270dfcab3876d1a0c7a402436ee255ba8155 Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sat, 27 Apr 2024 08:39:12 +0900
Subject: [PATCH 1/7] half moon waybar style to dark style waybar

---
 config/waybar/style/Half-Moon.css        | 201 -----------------
 config/waybar/style/[Dark] Half-Moon.css | 272 +++++++++++++++++++++++
 2 files changed, 272 insertions(+), 201 deletions(-)
 delete mode 100644 config/waybar/style/Half-Moon.css
 create mode 100644 config/waybar/style/[Dark] Half-Moon.css

diff --git a/config/waybar/style/Half-Moon.css b/config/waybar/style/Half-Moon.css
deleted file mode 100644
index 3fa290d..0000000
--- a/config/waybar/style/Half-Moon.css
+++ /dev/null
@@ -1,201 +0,0 @@
-/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
-/* ....................................*/
-/* ..........Half Moon.................. */
-/* NOTE: This is only for some waybar configs */
-/* --- 👍 shared by https://github.com/TomekBobrowicz  👍 --- */
-
-* {
-font-size: 97%;
-font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
-font-weight: bold;
-}
-window#waybar {
-  background-color: rgba(26,27,38,0);
-  border-bottom: 1px solid rgba(26,27,38,0);
-  border-radius: 0px;
-  color: #E6B673;
-
-  }
-#workspaces {
-  background: #0F1419;
-  margin: 5px;
-  padding: 0px 1px;
-  border-radius: 15px;
-  border: 0px;
-  font-style: normal;
-  color: #0F1419;
-
-  }
-#workspaces button {
-	  padding: 0px 5px;
-  margin: 4px 3px;
-  border-radius: 15px;
-  border: 0px;
-  color: #0F1419;
-  background: linear-gradient(45deg, #95E6CB, #59C2FF, #D2A6FF);
-  opacity: 0.5;
-  transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-
-  }
-#workspaces button.active {
-  padding: 0px 5px;
-  margin: 4px 3px;
-  border-radius: 15px;
-  border: 0px;
-  color: #0F1419;
-  background: linear-gradient(45deg, #59C2FF, #D2A6FF);
-  opacity: 1.0;
-  min-width: 40px;
-  transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-  }
-#workspaces button:hover {
-  border-radius: 15px;
-  color: #0F1419;
-  background: linear-gradient(45deg, #59C2FF, #D2A6FF);
-  opacity: 0.8;
-  transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
-
-  }
-@keyframes gradient_horizontal {
-0% {
-  background-position: 0% 50%;
-}
-50% {
-  background-position: 100% 50%;
-}
-100% {
-  background-position: 0% 50%;
-}
-  }
-  @keyframes swiping {
-    0% {
-  background-position: 0% 200%;
-}
-100% {
-  background-position: 200% 200%;
-}
-  }
-  tooltip {
-background: #0F1419;
-border: 1px solid #D2A6FF;
-border-radius: 10px;
-  }
-  tooltip label {
-color: #F3F4F5;
-  }
-  #window {
-	  color: #E6E1CF;
-  background: #0F1419;
-  border-radius: 50px 15px 50px 15px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-  #temperature,
-  #memory {
-color: #E6B673;
-	  background: #0F1419;
-  border-radius: 50px 15px 50px 15px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-
-  #custom-swaync,
-  #idle_inhibitor,
-  #clock {
-	color: #B8CC52;
-	  background: #0F1419;
-  border-radius: 15px 50px 15px 50px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-  #cpu {
-	color: #F3F4F5;
-	  background: #0F1419;
-  border-radius: 50px 15px 50px 15px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-  #disk {
-	color: #B8CC52;
-	  background: #0F1419;
-  border-radius: 50px 15px 50px 15px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-  #battery {
-	color: #F07178;
-	  background: #0F1419;
-  border-radius: 15px 50px 15px 50px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-  #network {
-	color: #FF8F40;
-	  background: #0F1419;
-  border-radius: 50px 15px 50px 15px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-  #custom-hyprbindings {
-  color: #D2A6FF;
-	  background: #0F1419;
-  border-radius: 15px 50px 15px 50px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-  #tray {
-	color: #E6E1CF;
-	  background: #0F1419;
-  border-radius: 15px 30px 30px 50px;
-  margin: 5px 0px 5px 5px;
-  padding: 2px 20px;
-
-  }
-  #pulseaudio {
-	color: #59C2FF;
-	  background: #0F1419;
-  border-radius: 50px 15px 50px 15px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-  #custom-notification {
-	color: #95E6CB;
-	  background: #0F1419;
-  border-radius: 15px 50px 15px 50px;
-  margin: 5px;
-  padding: 2px 20px;
-
-  }
-  #custom-weather {
-	color: #59C2FF;
-	  background: #0F1419;
-  border-radius: 0px 50px 15px 0px;
-  margin: 5px 0px;
-  padding: 2px 15px 2px 5px;
-
-  }
-  #custom-menu {
-	color: #59C2FF;
-	  background: #0F1419;
-  border-radius: 0px 15px 50px 0px;
-  margin: 5px 5px 5px 0px;
-  padding: 1px 15px;
-
-  }
-  #custom-power {
-	color: #D2A6FF;
-	  background: #0F1419;
-  border-radius: 15px 0px 0px 50px;
-  margin: 5px 0px;
-  padding: 2px 5px 2px 15px;
-
-  } 
diff --git a/config/waybar/style/[Dark] Half-Moon.css b/config/waybar/style/[Dark] Half-Moon.css
new file mode 100644
index 0000000..ac30318
--- /dev/null
+++ b/config/waybar/style/[Dark] Half-Moon.css	
@@ -0,0 +1,272 @@
+/* ----------- 💫 https://github.com/JaKooLit 💫 -------- */
+/* ....................................*/
+/* ..........Half Moon.................. */
+/* NOTE: This is only for some waybar configs */
+/* --- 👍 shared by https://github.com/TomekBobrowicz  👍 --- */
+
+* {
+font-size: 97%;
+font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
+font-weight: bold;
+}
+
+window#waybar {
+  background-color: rgba(26,27,38,0);
+  border-bottom: 1px solid rgba(26,27,38,0);
+  border-radius: 0px;
+  color: #E6B673;
+}
+
+#taskbar,
+#workspaces {
+  background: #0F1419;
+  margin: 5px;
+  padding: 0px 1px;
+  border-radius: 15px;
+  border: 0px;
+  font-style: normal;
+  color: #0F1419;
+}
+
+#taskbar button,
+#workspaces button {
+  padding: 0px 5px;
+  margin: 4px 3px;
+  border-radius: 15px;
+  border: 0px;
+  color: #0F1419;
+  background: linear-gradient(45deg, #95E6CB, #59C2FF, #D2A6FF);
+  opacity: 0.5;
+  transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#taskbar button.active,
+#workspaces button.active {
+  padding: 0px 5px;
+  margin: 4px 3px;
+  border-radius: 15px;
+  border: 0px;
+  color: #0F1419;
+  background: linear-gradient(45deg, #59C2FF, #D2A6FF);
+  opacity: 1.0;
+  min-width: 40px;
+  transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+}
+
+#workspaces button:hover {
+  border-radius: 15px;
+  color: #0F1419;
+  background: linear-gradient(45deg, #59C2FF, #D2A6FF);
+  opacity: 0.8;
+  transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
+
+}
+@keyframes gradient_horizontal {
+0% {
+  background-position: 0% 50%;
+	}
+50% {
+  background-position: 100% 50%;
+	}
+100% {
+  background-position: 0% 50%;
+	}
+}
+
+@keyframes swiping {
+0% {
+  background-position: 0% 200%;
+	}
+100% {
+  background-position: 200% 200%;
+	}
+}
+
+tooltip {
+background: #0F1419;
+border: 1px solid #D2A6FF;
+border-radius: 10px;
+}
+
+tooltip label {
+color: #F3F4F5;
+}
+
+#window {
+	color: #E6E1CF;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#temperature,
+#memory {
+	color: #E6B673;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#custom-light_dark,
+#custom-swaync,
+#idle_inhibitor,
+#clock {
+	color: #B8CC52;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#cpu {
+	color: #F3F4F5;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#disk {
+	color: #B8CC52;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#backlight,
+#battery {
+	color: #F07178;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#backlight {
+	color: white;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#network {
+	color: #FF8F40;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#custom-hyprbindings {
+	color: #D2A6FF;
+	background: #0F1419;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#tray {
+	color: #E6E1CF;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#pulseaudio {
+	color: #59C2FF;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#custom-notification {
+	color: #95E6CB;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#custom-weather {
+	color: #59C2FF;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#custom-menu {
+	color: #59C2FF;
+	background: #0F1419;
+	border-radius: 0px 15px 50px 0px;
+	margin: 5px 5px 5px 0px;
+	padding: 1px 15px;
+}
+
+#custom-power {
+	color: #D2A6FF;
+	background: #0F1419;
+	border-radius: 15px 0px 0px 50px;
+	margin: 5px 0px;
+	padding: 2px 5px 2px 15px;
+} 
+
+#battery.critical:not(.charging) {
+	color: #f53c3c;
+	animation-name: blink;
+	animation-duration: 0.5s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+	animation-direction: alternate;
+}
+
+#pulseaudio-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#pulseaudio-slider trough {
+	min-width: 80px;
+	min-height: 5px;
+	border-radius: 5px;
+	background-color: #6E6A86;
+}
+
+#pulseaudio-slider highlight {
+	min-height: 10px;
+	border-radius: 5px;
+	background-color: purple;
+}
+
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#backlight-slider trough {
+	min-width: 80px;
+	min-height: 10px;
+	border-radius: 5px;
+	background-color: #6E6A86;
+}
+
+#backlight-slider highlight {
+	min-width: 10px;
+	border-radius: 5px;
+	background-color: purple;
+}
\ No newline at end of file

From 87297c02a4848d2dc32b85d3beeb5b8655adf737 Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sat, 27 Apr 2024 11:47:46 +0900
Subject: [PATCH 2/7] bump to v2.2.9. Updated swww

---
 config/hypr/UserConfigs/Startup_Apps.conf  | 4 ++--
 config/hypr/UserScripts/WallpaperRandom.sh | 2 +-
 config/hypr/UserScripts/WallpaperSelect.sh | 2 +-
 config/hypr/{v2.2.8 => v2.2.9}             | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename config/hypr/{v2.2.8 => v2.2.9} (100%)

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index 86e40ba..156b96e 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -9,7 +9,7 @@ $lock = $scriptsDir/LockScreen.sh
 $SwwwRandom = $UserScripts/WallpaperAutoChange.sh
 
 # wallpaper stuff / More wallpaper options below
-exec-once = swww query || swww-daemon --format xrgb
+exec-once = swww query || swww-daemon
 exec-once = $SwwwRandom $wallDIR # random wallpaper switcher every 30 minutes 
 
 # Startup
@@ -38,7 +38,7 @@ exec-once = $UserScripts/RainbowBorders.sh
 exec-once = hypridle
 
 # Here are list of features available but disabled by default
-# exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
+# exec-once = swww query || swww-daemon && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
 
 #gnome polkit for nixos
 #exec-once = $scriptsDir/Polkit-NixOS.sh
diff --git a/config/hypr/UserScripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh
index 52fc819..c2467b0 100755
--- a/config/hypr/UserScripts/WallpaperRandom.sh
+++ b/config/hypr/UserScripts/WallpaperRandom.sh
@@ -17,7 +17,7 @@ BEZIER=".43,1.19,1,.4"
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER"
 
 
-swww query || swww-daemon --format xrgb && swww img ${RANDOMPICS} $SWWW_PARAMS
+swww query || swww-daemon && swww img ${RANDOMPICS} $SWWW_PARAMS
 
 
 ${scriptsDir}/PywalSwww.sh
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 8aa9bdd..c83ed8e 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -40,7 +40,7 @@ menu() {
   printf "$RANDOM_PIC_NAME\n"
 }
 
-swww query || swww-daemon --format xrgb
+swww query || swww-daemon
 
 main() {
   choice=$(menu | ${rofi_command})
diff --git a/config/hypr/v2.2.8 b/config/hypr/v2.2.9
similarity index 100%
rename from config/hypr/v2.2.8
rename to config/hypr/v2.2.9

From 1bd2f4c57cd5bb17b9a5a6732e91a8d01f33284d Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sat, 27 Apr 2024 15:08:18 +0900
Subject: [PATCH 3/7] small hyprlock config update

---
 config/hypr/hyprlock.conf | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 7e8c184..d46a2e4 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -4,14 +4,18 @@
 
 source = $HOME/.cache/wal/colors-hyprland
 
+# wallpaper and picture variables # NOTE only png supported for now
+$wallpaper  = $HOME/.config/rofi/.current_wallpaper
+$picture = $HOME/.config/rofi/.current_wallpaper
+
 general {
-    grace = 1
+    grace = 0.5
 }
 
 background {
     monitor =
 	path = screenshot   # screenshot of your desktop
-	# path = $HOME/.config/rofi/.current_wallpaper   # NOTE only png supported for now
+	#path = $wallpaper  # set the picture path above
     color = $color7
 
     # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
@@ -75,7 +79,7 @@ label {
 # text = cmd[update:1000] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM
 text = cmd[update:1000] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H
     color = $color7
-    font_size = 94
+    font_size = 90
     font_family = JetBrains Mono Nerd Font 10
 
     position = 0, -150
@@ -87,7 +91,7 @@ label {
     monitor =
     text =    $USER
     color = $color7
-    font_size = 18
+    font_size = 24
     font_family = Inter Display Medium
 
     position = 0, 200
@@ -119,10 +123,10 @@ label {
 
 image {
     monitor =
-    path = $HOME/.config/rofi/.current_wallpaper
+    path = $picture # set the picture path above
     size = 230
-    rounding = -1
-    border_size = 4
+    rounding = -2
+    border_size = 1
     border_color = $color12
     rotate = 0
     reload_time = -1

From ff3474cadf2525692042790becfc8dcb90d935b4 Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sun, 28 Apr 2024 00:35:26 +0900
Subject: [PATCH 4/7] minor update hyprlock

---
 config/hypr/hyprlock.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index d46a2e4..9459073 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -4,7 +4,7 @@
 
 source = $HOME/.cache/wal/colors-hyprland
 
-# wallpaper and picture variables # NOTE only png supported for now
+# wallpaper and picture variables # supports png, jpg, webp (no animations, though)
 $wallpaper  = $HOME/.config/rofi/.current_wallpaper
 $picture = $HOME/.config/rofi/.current_wallpaper
 

From 515ef3a3b4a7afcb521e939aa4fa9d74582caacd Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sun, 28 Apr 2024 09:19:38 +0900
Subject: [PATCH 5/7] updated half moon waybar

---
 config/waybar/style/[Dark] Half-Moon.css | 25 ++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/config/waybar/style/[Dark] Half-Moon.css b/config/waybar/style/[Dark] Half-Moon.css
index ac30318..4fff602 100644
--- a/config/waybar/style/[Dark] Half-Moon.css	
+++ b/config/waybar/style/[Dark] Half-Moon.css	
@@ -120,6 +120,15 @@ color: #F3F4F5;
 	padding: 2px 15px;
 }
 
+#bluetooth {
+	color: blue;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#custom-cycle_wall,
 #cpu {
 	color: #F3F4F5;
 	background: #0F1419;
@@ -218,6 +227,22 @@ color: #F3F4F5;
 	padding: 2px 5px 2px 15px;
 } 
 
+#custom-lock {
+	color: red;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
+#keyboard-state {
+	color: green;
+	background: #0F1419;
+	border-radius: 50px 50px;
+	margin: 5px;
+	padding: 2px 15px;
+}
+
 #battery.critical:not(.charging) {
 	color: #f53c3c;
 	animation-name: blink;

From 78256357235605fe99dad0d26af827d4357e02d2 Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sun, 28 Apr 2024 13:37:55 +0900
Subject: [PATCH 6/7] updated copy.sh to work with simple sddm 2 theme as well

---
 copy.sh | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/copy.sh b/copy.sh
index d3df387..75958a1 100755
--- a/copy.sh
+++ b/copy.sh
@@ -124,26 +124,38 @@ while true; do
   # Check if the answer is valid
   if [[ "$answer" == "y" ]]; then
     # Modify waybar config if 12hr is selected
-    sed -i 's/^    \/\/"format": " {:%I:%M %p}"/    "format": " {:%I:%M %p}"/' ./config/waybar/modules
-    sed -i 's/^    "format": " {:%H:%M:%S}"/    \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules
+    sed -i 's/^    \/\/"format": " {:%I:%M %p}"/    "format": " {:%I:%M %p}"/' ./config/waybar/modules 2>&1 | tee -a "$LOG" || true
+    sed -i 's/^    "format": " {:%H:%M:%S}"/    \/\/"format": " {:%H:%M:%S}"/' ./config/waybar/modules 2>&1 | tee -a "$LOG" || true
     
     # for hyprlock
-    sed -i 's|^# text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|' ./config/hypr/hyprlock.conf
+    sed -i 's|^# text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|text = cmd\[update:1000\] echo "<b><big> $(date +"%I:%M:%S %p") </big></b>" # AM/PM|' ./config/hypr/hyprlock.conf 
     sed -i 's|^text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|# text = cmd\[update:1000\] echo "<b><big> $(date +"%H:%M:%S") </big></b>" # 24H|' ./config/hypr/hyprlock.conf
 
-    # for SDDM (custom theme)
+    # for SDDM (simple-sddm)
     sddm_folder="/usr/share/sddm/themes/simple-sddm"
     if [ -d "$sddm_folder" ]; then
-      echo "Simple sddm exists. Editing to 12H format"
+      echo "Simple sddm exists. Editing to 12H format" 2>&1 | tee -a "$LOG"
 
-      sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder/theme.conf"
-      sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder/theme.conf"
+      sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder/theme.conf" 2>&1 | tee -a "$LOG" || true
+      sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder/theme.conf" 2>&1 | tee -a "$LOG" || true
 
-      echo "12H format set to SDDM theme successfully."
+      echo "12H format set to SDDM theme successfully." 2>&1 | tee -a "$LOG"
     fi
+
+        # for SDDM (simple-sddm-2)
+    sddm_folder_2="/usr/share/sddm/themes/simple-sddm-2"
+    if [ -d "$sddm_folder_2" ]; then
+      echo "Simple sddm 2 exists. Editing to 12H format" 2>&1 | tee -a "$LOG"
+
+      sudo sed -i 's|^## HourFormat="hh:mm AP"|HourFormat="hh:mm AP"|' "$sddm_folder_2/theme.conf" 2>&1 | tee -a "$LOG" || true
+      sudo sed -i 's|^HourFormat="HH:mm"|## HourFormat="HH:mm"|' "$sddm_folder_2/theme.conf" 2>&1 | tee -a "$LOG" || true
+
+      echo "12H format set to SDDM theme successfully." 2>&1 | tee -a "$LOG"
+    fi
+
     break
   elif [[ "$answer" == "n" ]]; then
-    echo "You chose not to change to 12H format."
+    echo "You chose not to change to 12H format." 2>&1 | tee -a "$LOG"
     break
   else
     echo "Invalid choice. Please enter y for yes or n for no."

From c5ec8c40bfa68d46f3c9c4da064eab56a3445072 Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sun, 28 Apr 2024 13:43:52 +0900
Subject: [PATCH 7/7] reverted back the --format xrgb for swww as still not
 published the fix

---
 config/hypr/UserConfigs/Startup_Apps.conf  | 4 ++--
 config/hypr/UserScripts/WallpaperRandom.sh | 2 +-
 config/hypr/UserScripts/WallpaperSelect.sh | 2 +-
 config/hypr/{v2.2.9 => v2.2.8}             | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename config/hypr/{v2.2.9 => v2.2.8} (100%)

diff --git a/config/hypr/UserConfigs/Startup_Apps.conf b/config/hypr/UserConfigs/Startup_Apps.conf
index 156b96e..86e40ba 100644
--- a/config/hypr/UserConfigs/Startup_Apps.conf
+++ b/config/hypr/UserConfigs/Startup_Apps.conf
@@ -9,7 +9,7 @@ $lock = $scriptsDir/LockScreen.sh
 $SwwwRandom = $UserScripts/WallpaperAutoChange.sh
 
 # wallpaper stuff / More wallpaper options below
-exec-once = swww query || swww-daemon
+exec-once = swww query || swww-daemon --format xrgb
 exec-once = $SwwwRandom $wallDIR # random wallpaper switcher every 30 minutes 
 
 # Startup
@@ -38,7 +38,7 @@ exec-once = $UserScripts/RainbowBorders.sh
 exec-once = hypridle
 
 # Here are list of features available but disabled by default
-# exec-once = swww query || swww-daemon && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
+# exec-once = swww query || swww-daemon --format xrgb && swww img $HOME/Pictures/wallpapers/mecha-nostalgia.png  # persistent wallpaper
 
 #gnome polkit for nixos
 #exec-once = $scriptsDir/Polkit-NixOS.sh
diff --git a/config/hypr/UserScripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh
index c2467b0..52fc819 100755
--- a/config/hypr/UserScripts/WallpaperRandom.sh
+++ b/config/hypr/UserScripts/WallpaperRandom.sh
@@ -17,7 +17,7 @@ BEZIER=".43,1.19,1,.4"
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION --transition-bezier $BEZIER"
 
 
-swww query || swww-daemon && swww img ${RANDOMPICS} $SWWW_PARAMS
+swww query || swww-daemon --format xrgb && swww img ${RANDOMPICS} $SWWW_PARAMS
 
 
 ${scriptsDir}/PywalSwww.sh
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index c83ed8e..8aa9bdd 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -40,7 +40,7 @@ menu() {
   printf "$RANDOM_PIC_NAME\n"
 }
 
-swww query || swww-daemon
+swww query || swww-daemon --format xrgb
 
 main() {
   choice=$(menu | ${rofi_command})
diff --git a/config/hypr/v2.2.9 b/config/hypr/v2.2.8
similarity index 100%
rename from config/hypr/v2.2.9
rename to config/hypr/v2.2.8