Merge pull request #101 from JaKooLit/Development

Development

5 files changed, 31 insertions, 19 deletions

diff --git a/config/hypr/configs/Execs.conf b/config/hypr/configs/Execs.conf
index e9f9dcdc..76ec382b 100644
--- a/config/hypr/configs/Execs.conf
+++ b/config/hypr/configs/Execs.conf
@@ -6,6 +6,9 @@ $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 
@@ -31,9 +34,6 @@ 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 fe568b7a..cbf13b40 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -24,17 +24,11 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
     # 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 query || swww init && $swww "$wallpaper" $effect
-
-    # Refreshing waybar, dunst, rofi etc. 
-    "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 &
-    "$scriptsDir/Refresh.sh" > /dev/null 2>&1 &
+   	swww init && $swww "$wallpaper" $effect
     
     # initiate GTK dark mode and apply icon and cursor theme
+    gsettings set org.gnome.desktop.interface color-scheme prefer-dark > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface gtk-theme Tokyonight-Dark-BL-LB > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface icon-theme Tokyonight-Dark > /dev/null 2>&1 &
     gsettings set org.gnome.desktop.interface cursor-theme Bibata-Modern-Ice > /dev/null 2>&1 &
@@ -46,6 +40,13 @@ if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
     # initiate the kb_layout (for some reason) waybar cant launch it
     "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 &
 
+    # Initial waybar style
+    ln -sf "$waybar_style" "$HOME/.config/waybar/style.css"
+	
+	# Refreshing waybar, dunst, rofi etc. 
+    "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 &
+    "$scriptsDir/Refresh.sh" > /dev/null 2>&1 &
+
     # Create a marker file to indicate that the script has been executed.
     touch ~/.config/hypr/.initial_startup_done
 
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index 583fc386..612540b8 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -108,13 +108,16 @@ set_custom_gtk_theme() {
     mode=$1
     gtk_themes_directory="$HOME/.themes"
     icon_directory="$HOME/.icons"
+    color_setting="org.gnome.desktop.interface color-scheme"
     theme_setting="org.gnome.desktop.interface gtk-theme"
     icon_setting="org.gnome.desktop.interface icon-theme"
 
     if [ "$mode" == "Light" ]; then
         search_keywords="*Light*"
+        gsettings set $color_setting 'prefer-light'
     elif [ "$mode" == "Dark" ]; then
         search_keywords="*Dark*"
+        gsettings set $color_setting 'prefer-dark'
     else
         echo "Invalid mode provided."
         return 1
@@ -139,6 +142,11 @@ set_custom_gtk_theme() {
         fi
         echo "Selected GTK theme for $mode mode: $selected_theme"
         gsettings set $theme_setting "$selected_theme"
+
+        # Flatpak GTK apps
+        if command -v flatpak &> /dev/null; then
+            flatpak --user override --env=GTK_THEME="$selected_theme"
+        fi
     else
         echo "No $mode GTK theme found"
     fi
@@ -151,16 +159,20 @@ set_custom_gtk_theme() {
         fi
         echo "Selected icon theme for $mode mode: $selected_icon"
         gsettings set $icon_setting "$selected_icon"
-		
-		## QT5ct icon_theme
-		sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt5ct/qt5ct.conf"
-		sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt6ct/qt6ct.conf"
+        
+        ## QT5ct icon_theme
+        sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt5ct/qt5ct.conf"
+        sed -i "s|^icon_theme=.*$|icon_theme=$selected_icon|" "$HOME/.config/qt6ct/qt6ct.conf"
+
+        # Flatpak GTK apps
+        if command -v flatpak &> /dev/null; then
+            flatpak --user override --env=ICON_THEME="$selected_icon"
+        fi
     else
         echo "No $mode icon theme found"
     fi
 }
 
-
 # Call the function to set GTK theme and icon theme based on mode
 set_custom_gtk_theme "$next_mode"
 
@@ -168,7 +180,6 @@ set_custom_gtk_theme "$next_mode"
 update_theme_mode
 
 sleep 0.5
-
 # Run remaining scripts
 ${SCRIPTSDIR}/PywalSwww.sh
 sleep 1
diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf
index 9309dbc5..3dcfc536 100644
--- a/config/qt5ct/qt5ct.conf
+++ b/config/qt5ct/qt5ct.conf
@@ -7,7 +7,7 @@ style=kvantum
 
 [Fonts]
 fixed="Fira Code Medium,12,-1,5,57,0,0,0,0,0,Regular"
-general="Fira Code Medium,12,-1,5,57,0,0,0,0,0,Regular"
+general="Fira Code Medium,14,-1,5,57,0,0,0,0,0,Regular"
 
 [Interface]
 activate_item_on_single_click=1
diff --git a/config/qt6ct/qt6ct.conf b/config/qt6ct/qt6ct.conf
index 7ec82621..c80cbf1e 100644
--- a/config/qt6ct/qt6ct.conf
+++ b/config/qt6ct/qt6ct.conf
@@ -7,7 +7,7 @@ style=kvantum
 
 [Fonts]
 fixed="Fira Code Medium,12,-1,5,57,0,0,0,0,0,Regular"
-general="Fira Code Medium,12,-1,5,57,0,0,0,0,0,Regular"
+general="Fira Code Medium,14,-1,5,57,0,0,0,0,0,Regular"
 
 [Interface]
 activate_item_on_single_click=1