From ed3f105346d064cbc0fd45f0d34bff4d76eb502c Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Fri, 22 Dec 2023 10:50:09 +0900
Subject: [PATCH] The initial_boot.sh was moved towards the end of Execs.conf
 to avoid conflict with swww Initial_boot.sh also now includes setting of qt
 apps using kvantummanager Updated dark_light.sh

---
 config/hypr/configs/Execs.conf   |  6 +++---
 config/hypr/initial-boot.sh      | 12 ++++++++++--
 config/hypr/scripts/DarkLight.sh |  6 +++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf
index 76ec382..e9f9dcd 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/configs/Execs.conf
@@ -6,9 +6,6 @@ $lock = $scriptsDir/LockScreen.sh
 $SwwwRandom = $scriptsDir/WallpaperRandom.sh
 $WallpaperPath = $HOME/Pictures/wallpapers
 
-# Initial boot script to start Pywal and Set wallpaper. This line and corresponding script can be safely deleted once logged in
-exec-once = $HOME/.config/hypr/initial-boot.sh
-
 # wallpaper stuff / More wallpaper options below
 exec-once = swww query || swww init
 exec-once = $SwwwRandom $WallpaperPath # random wallpaper switcher every 30 minutes 
@@ -34,6 +31,9 @@ exec-once = wl-paste --type image --watch cliphist store
 # Rainbow borders
 exec-once = $scriptsDir/RainbowBorders.sh
 
+# Initial boot script to start Pywal and Set wallpaper. This line and corresponding script can be safely deleted once logged in
+exec-once = $HOME/.config/hypr/initial-boot.sh
+
 # sway-idle with lock only
 exec-once = swayidle -w timeout 900 '$lock'
 # sway-idle with lock and sleep
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 1ab8b01..a51f479 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -8,6 +8,8 @@
 # Variables
 scriptsDir=$HOME/.config/hypr/scripts
 wallpaper=$HOME/Pictures/wallpapers/Cute-Cat_ja.png
+waybar_style="$HOME/.config/waybar/configs/[Pywal] Chroma Fusion.css"
+kvantum_theme="Tokyo-Night"
 
 swww="swww img"
 effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2"
@@ -16,14 +18,17 @@ effect="--transition-bezier .43,1.19,1,.4 --transition-fps 30 --transition-type
 if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
 
     # Initialize pywal
-    printf " Initializing pywal........\n\n"
+    #printf " Initializing pywal........\n\n"
     wal -i $wallpaper -s -t
 
     # Initial symlink for Pywal Dark and Light for Rofi Themes
     ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"
 
+    # Initial waybar style
+    ln -sf "$waybar_style" "$HOME/.config/waybar/style.css"
+
     # Initial scripts to load in order to have a proper wallpaper waybar and pywal themes
-    swww init || swww query && $swww "$wallpaper" $effect
+    swww query && $swww "$wallpaper" $effect
 
     # Refreshing waybar, dunst, rofi etc. 
     "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 &
@@ -35,6 +40,9 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
     gsettings set org.gnome.desktop.interface cursor-theme Bibata-Modern-Ice > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface cursor-size 24 > /dev/null 2>&1 &
     
+    # initiate kvantum theme
+    kvantummanager --set "$kvantum_theme" > /dev/null 2>&1 &
+
     # initiate the kb_layout (for some reason) waybar cant launch it
     "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 &
 
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index aed6595..dd8f6e4 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -45,13 +45,13 @@ set_waybar_style() {
 if [ "$(cat ~/.cache/.wallpaper_mode)" = "Light" ]; then
     next_mode="Dark"
     wallpaper_path="$dark_wallpapers"
-	kvantum_mode="Tokyo-Night"
+	kvantum_theme="Tokyo-Night"
  	qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Night.conf"
 	qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Tokyo-Night.conf"
 else
     next_mode="Light"
     wallpaper_path="$light_wallpapers"
-	kvantum_mode="Tokyo-Day"
+	kvantum_theme="Tokyo-Day"
 	qt5ct_color_scheme="$HOME/.config/qt5ct/colors/Tokyo-Day.conf"
 	qt6ct_color_scheme="$HOME/.config/qt6ct/colors/Tokyo-Day.conf"
 fi
@@ -72,7 +72,7 @@ fi
 
 # QT APPS Change Kvantum Manager theme & QT5CT Settings
 # QT Icons at below with GTK Icons
-kvantummanager --set "$kvantum_mode"
+kvantummanager --set "$kvantum_theme"
 sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt5ct_color_scheme|" "$HOME/.config/qt5ct/qt5ct.conf"
 sed -i "s|^color_scheme_path=.*$|color_scheme_path=$qt6ct_color_scheme|" "$HOME/.config/qt6ct/qt6ct.conf"