Merge pull request #53 from JaKooLit/v2.1.17

V2.1.17

4 files changed, 69 insertions, 21 deletions

diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index d5ce3233..797f49cb 100644..100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -1,30 +1,39 @@
 #!/bin/bash
 
-# THIS SCRIPT CAN BE DELETED ONCE BOOTED!!
+# A bash script designed to run only once dotfiles installed
+
+# THIS SCRIPT CAN BE DELETED ONCE SUCCESSFULLY BOOTED!! And also, edit ~/.config/hypr/configs/Execs.conf
+# not necessary to do since this script is only designed to run only once as long as the marker exists
+
+# Variables
+scriptsDir=$HOME/.config/hypr/scripts
+wallpaper=$HOME/Pictures/wallpapers/anime-girl-abyss.png
+
+swww="swww img"
+effect="--transition-bezier .43,1.19,1,.4 --transition-fps 60 --transition-type grow --transition-pos 0.925,0.977 --transition-duration 2"
 
-# A bash script designed to ran it only once dotfiles installed
 # Check if a marker file exists.
 if [ ! -f ~/.config/hypr/.initial_startup_done ]; then
 
-	# Check if the ~/.cache/wal directory exists
-	if [ ! -d ~/.cache/wal ]; then
-    	printf " Initializing pywal........\n\n"
-    	# Check if the ~/Pictures/wallpapers directory exists
-    	if [ -d ~/Pictures/wallpapers ]; then
-        	# Run wal with random wallpapers from ~/Pictures/wallpapers
-        	wal -i ~/Pictures/wallpapers/mecha-nostalgia.png 
-        	echo "Pywal initialized"
-		fi
-	fi
+    # Initialize pywal
+    printf " Initializing pywal........\n\n"
+    wal -i "$wallpaper"
+
+    # 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 scripts to load in order to have a proper wallpaper waybar and pywal themes
+    pkill swww && swww init || swww query && $swww "$wallpaper" $effect
+
+    # Refreshing waybar, dunst, rofi etc. 
+    "$scriptsDir/PywalSwww.sh" > /dev/null 2>&1 &
+    "$scriptsDir/Refresh.sh" > /dev/null 2>&1 &
+    
+    # initiate the kb_layout (for some reason) waybar cant launch it
+    "$scriptsDir/SwitchKeyboardLayout.sh" > /dev/null 2>&1 &
 
-	#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 scripts to load inorder to have a proper wallpaper waybar and pywal themes
-	exec $HOME/.config/hypr/scripts/Wallpaper.sh &
-	
     # Create a marker file to indicate that the script has been executed.
     touch ~/.config/hypr/.initial_startup_done
-fi
-
 
+    exit
+fi
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index 2072e1be..dc7adda0 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -46,7 +46,7 @@ notify_user "$next_mode"
 
 # Change background for dunst
 if [ "$next_mode" = "dark" ]; then
-    sed -i '/background = /s/.*/    background = "#00000080"/' "${dunst_config}/dunstrc"
+    sed -i '/background = /s/.*/    background = "#00000095"/' "${dunst_config}/dunstrc"
 	sed -i '/foreground = /s/.*/    foreground = "#fafafa"/' "${dunst_config}/dunstrc"
 else
     sed -i '/background = /s/.*/    background = "#FFFFFF80"/' "${dunst_config}/dunstrc"
diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh
new file mode 100755
index 00000000..e7c56b42
--- /dev/null
+++ b/config/hypr/scripts/SwitchKeyboardLayout.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+layout_f="$HOME/.cache/kb_layout"
+settings_file="$HOME/.config/hypr/configs/Settings.conf"
+
+# Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found
+if [ ! -f "$layout_f" ]; then
+  default_layout=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2 | cut -d ',' -f 1 2>/dev/null)
+  if [ -z "$default_layout" ]; then
+    default_layout="us" # Default to 'us' layout if Settings.conf or 'kb_layout' is not found
+  fi
+  echo "$default_layout" > "$layout_f"
+fi
+
+current_layout=$(cat "$layout_f")
+
+# Read keyboard layout settings from Settings.conf
+if [ -f "$settings_file" ]; then
+  kb_layout_line=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2)
+  IFS=',' read -ra layout_mapping <<< "$kb_layout_line"
+fi
+
+layout_count=${#layout_mapping[@]}
+
+# Find the index of the current layout in the mapping
+for ((i = 0; i < layout_count; i++)); do
+  if [ "$current_layout" == "${layout_mapping[i]}" ]; then
+    current_index=$i
+    break
+  fi
+done
+
+# Calculate the index of the next layout
+next_index=$(( (current_index + 1) % layout_count ))
+new_layout="${layout_mapping[next_index]}"
+
+# Update the keyboard layout
+hyprctl keyword input:kb_layout "$new_layout"
+echo "$new_layout" > "$layout_f"
diff --git a/config/hypr/v2.1.16 b/config/hypr/v2.1.17
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.1.16
+++ b/config/hypr/v2.1.17