9 files changed, 81 insertions, 79 deletions
diff --git a/config/hypr/UserConfigs/Monitors.conf b/config/hypr/UserConfigs/Monitors.conf
index 36781f99..f4b313d7 100644
--- a/config/hypr/UserConfigs/Monitors.conf
+++ b/config/hypr/UserConfigs/Monitors.conf
@@ -5,7 +5,6 @@
 # https://wiki.hyprland.org/Configuring/Monitors/
 # Configure your Display resolution, offset, scale and Monitors here, use `hyprctl monitors` to get the info.
 
-
 # Monitors
 monitor=,preferred,auto,1
 
@@ -13,16 +12,17 @@ monitor=,preferred,auto,1
 # Created this inorder for the monitor display to not wake up if not intended.
 # See here: https://github.com/hyprwm/Hyprland/issues/4090
 
+# Some examples
 #monitor = eDP-1, preferred, auto, 1
 #monitor = eDP-1, 2560x1440@165, 0x0, 1 #own screen
 #monitor = DP-3, 1920x1080@240, auto, 1 
 #monitor = DP-1, preferred, auto, 1
 #monitor = HDMI-A-1, preferred,auto,1
 
-# QEMU-KVM or any virtual box
+# QEMU-KVM, virtual box or vmware
 #monitor = Virtual-1, 1920x1080@60,auto,1
 
-# Hi Refresh Rate
+# High Refresh Rate
 #monitor=,highrr,auto,1
 
 # High Resolution
@@ -31,18 +31,21 @@ monitor=,preferred,auto,1
 # to disable a monitor
 #monitor=name,disable
 
-# Mirror
+# Mirror samples
 #monitor=DP-3,1920x1080@60,0x0,1,mirror,DP-2
 #monitor=,preferred,auto,1,mirror,eDP-1
-
-
-# Example :
-#monitor=eDP-1,2560x1440@165,0x0,1
-#workspace=HDMI-A-1,1
 #monitor=HDMI-A-1,2560x1440@144,0x0,1,mirror,eDP-1
-#workspace=HDMI-A-2,2
+
+# 10 bit monitor support - See wiki https://wiki.hyprland.org/Configuring/Monitors/#10-bit-support - See NOTES below
+# NOTE: Colors registered in Hyprland (e.g. the border color) do not support 10 bit.
+# NOTE: Some applications do not support screen capture with 10 bit enabled. (Screen captures like OBS may render black screen)
+# monitor=,preferred,auto,1,bitdepth,10
 
 #monitor=eDP-1,transform,0
 #monitor=eDP-1,addreserved,10,10,10,49
-#workspace=eDP-1,1
+
+# workspaces - Monitor rules
+# https://wiki.hyprland.org/Configuring/Workspace-Rules/
+# SUPER E - Workspace-Rules 
+# See ~/.config/hypr/UserConfigs/WorkspaceRules.conf
 
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 602531e1..c9eb5cdf 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -25,6 +25,7 @@ windowrulev2 = idleinhibit fullscreen, fullscreen:1
 windowrulev2 = workspace 1, class:^([Tt]hunderbird)$
 windowrulev2 = workspace 2, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
 windowrulev2 = workspace 2, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
+windowrulev2 = workspace 2, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
 #windowrulev2 = workspace 3, class:^([Tt]hunar)$
 windowrulev2 = workspace 4, class:^(com.obsproject.Studio)$
 windowrulev2 = workspace 5, class:^([Ss]team)$
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index cd604619..8864a30c 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -2,7 +2,7 @@
 # Rofi menu for Quick Edit / View of Settings (SUPER E)
 
 # define your preferred text editor and terminal to use
-editor=nano
+editor=${EDITOR:-nano}
 tty=kitty
 
 configs="$HOME/.config/hypr/configs"
diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh
index 84f8fd7b..cc6a5781 100755
--- a/config/hypr/UserScripts/WallpaperEffects.sh
+++ b/config/hypr/UserScripts/WallpaperEffects.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
-# Wallpaper Effects using imagemagick
+# Wallpaper Effects using ImageMagick
 # Inspiration from ML4W - Stephan Raabe https://gitlab.com/stephan-raabe/dotfiles
 
-# variables
+# Variables
 current_wallpaper="$HOME/.config/hypr/wallpaper_effects/.wallpaper_current"
 wallpaper_output="$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified"
 SCRIPTSDIR="$HOME/.config/hypr/scripts"
@@ -20,27 +20,26 @@ BEZIER=".43,1.19,1,.4"
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION"
 
 # Define ImageMagick effects
-# https://imagemagick.org/script/magick.php
-
 declare -A effects=(
-["Black & White"]="magick $current_wallpaper -colorspace gray -sigmoidal-contrast 10,40% $wallpaper_output"
-["Blurred"]="magick $current_wallpaper -blur 0x5 $wallpaper_output"
-["Solarize"]="magick $current_wallpaper -solarize 80% $wallpaper_output"
-["Sepia Tone"]="magick $current_wallpaper -sepia-tone 65% $wallpaper_output"
-["Negate"]="magick $current_wallpaper -negate $wallpaper_output"
-["Charcoal"]="magick $current_wallpaper -charcoal 0x5 $wallpaper_output"
-["Edge Detect"]="magick $current_wallpaper -edge 1 $wallpaper_output"
-["Emboss"]="magick $current_wallpaper -emboss 0x5 $wallpaper_output"
-["Sharpen"]="magick $current_wallpaper -sharpen 0x5 $wallpaper_output"
-["Oil Paint"]="magick $current_wallpaper -paint 4 $wallpaper_output"
-["Vignette"]="magick $current_wallpaper -vignette 0x5 $wallpaper_output"
-["Posterize"]="magick $current_wallpaper -posterize 4 $wallpaper_output"
-["Polaroid"]="magick $current_wallpaper -polaroid 0 $wallpaper_output"
-["No Effects"]="no-effects"
+    ["No Effects"]="no-effects"
+    ["Black & White"]="magick $current_wallpaper -colorspace gray -sigmoidal-contrast 10,40% $wallpaper_output"
+    ["Blurred"]="magick $current_wallpaper -blur 0x10 $wallpaper_output"
+    ["Charcoal"]="magick $current_wallpaper -charcoal 0x5 $wallpaper_output"
+    ["Edge Detect"]="magick $current_wallpaper -edge 1 $wallpaper_output"
+    ["Emboss"]="magick $current_wallpaper -emboss 0x5 $wallpaper_output"
+    ["Negate"]="magick $current_wallpaper -negate $wallpaper_output"
+    ["Oil Paint"]="magick $current_wallpaper -paint 4 $wallpaper_output"
+    ["Posterize"]="magick $current_wallpaper -posterize 4 $wallpaper_output"
+    ["Polaroid"]="magick $current_wallpaper -polaroid 0 $wallpaper_output"
+    ["Sepia Tone"]="magick $current_wallpaper -sepia-tone 65% $wallpaper_output"
+    ["Solarize"]="magick $current_wallpaper -solarize 80% $wallpaper_output"
+    ["Sharpen"]="magick $current_wallpaper -sharpen 0x5 $wallpaper_output"
+    ["Vignette"]="magick $current_wallpaper -vignette 0x5 $wallpaper_output"
+    ["Zoomed"]="magick $current_wallpaper -gravity Center -extent 1:1 $wallpaper_output"
 )
 
 # Function to apply no effects
-no_effects() {
+no-effects() {
     swww img -o "$focused_monitor" "$current_wallpaper" $SWWW_PARAMS &
     # Wait for swww command to complete
     wait $!
@@ -51,56 +50,52 @@ no_effects() {
     # Refresh rofi, waybar, wallust palettes
     "${SCRIPTSDIR}/Refresh.sh"
     notify-send -u low -i "$iDIR/bell.png" "No wallpaper effects"
-	
-	# copying wallpaper for rofi menu
-	cp $current_wallpaper $wallpaper_output
+    # copying wallpaper for rofi menu
+    cp "$current_wallpaper" "$wallpaper_output"
 }
 
 # Function to run rofi menu
 main() {
     # Populate rofi menu options
-    options="No Effects"
+    options=("No Effects")
     for effect in "${!effects[@]}"; do
-        if [ "$effect" != "No Effects" ]; then
-            options+="\n$effect"
-        fi
+        [[ "$effect" != "No Effects" ]] && options+=("$effect")
     done
 
-    # rofi
-    choice=$(echo -e "$options" | rofi -i -dmenu -config ~/.config/rofi/config-wallpaper-effect.rasi) 
-    if [ ! -z "$choice" ]; then
-        # Check if the choice exists in the array
-        if [[ "${effects[$choice]+exists}" ]]; then
-            if [ "$choice" == "No Effects" ]; then
-                no_effects
-            else
-                # Apply selected effect
-                notify-send -u normal -i "$iDIR/bell.png" "Applying $choice effects"
-                eval "${effects[$choice]}"
-                # Wait for effects to be applied
-                sleep 1
-                # Execute swww command after image conversion
-                swww img -o "$focused_monitor" "$wallpaper_output" $SWWW_PARAMS &
-                # Wait for swww command to complete
-                wait $!
-                # Run other commands after swww
-                wallust run "$wallpaper_output" -s &
-                # Wait for other commands to finish
-                wait $!
-                # Refresh rofi, waybar, wallust palettes
-                "${SCRIPTSDIR}/Refresh.sh"
-                notify-send -u low -i "$iDIR/bell.png" "$choice effects applied"
-            fi
+    # Show rofi menu and handle user choice
+    choice=$(printf "%s\n" "${options[@]}" | LC_COLLATE=C sort | rofi -dmenu -p "Choose effect" -i -config ~/.config/rofi/config-wallpaper-effect.rasi)
+
+    # Process user choice
+    if [[ -n "$choice" ]]; then
+        if [[ "$choice" == "No Effects" ]]; then
+            no-effects
+        elif [[ "${effects[$choice]+exists}" ]]; then
+            # Apply selected effect
+            notify-send -u normal -i "$iDIR/bell.png" "Applying $choice effects"
+            eval "${effects[$choice]}"
+            # Wait for effects to be applied
+            sleep 1
+            # Execute swww command after image conversion
+            swww img -o "$focused_monitor" "$wallpaper_output" $SWWW_PARAMS &
+            # Wait for swww command to complete
+            wait $!
+            # Wait for other commands to finish
+            wallust run "$wallpaper_output" -s &
+            # Wait for other commands to finish
+            wait $!
+            # Refresh rofi, waybar, wallust palettes
+            "${SCRIPTSDIR}/Refresh.sh"
+            notify-send -u low -i "$iDIR/bell.png" "$choice effects applied"
         else
-            echo "Effects not recognized."
+            echo "Effect '$choice' not recognized."
         fi
     fi
 }
 
-# Check if rofi is already running
+# Check if rofi is already running and kill it
 if pidof rofi > /dev/null; then
-  pkill rofi
-  exit 0
+    pkill rofi
+    exit 0
 fi
 
 main
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index d2ca7c28..23c02805 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -21,20 +21,23 @@ if pidof swaybg > /dev/null; then
   pkill swaybg
 fi
 
-# Retrieve image files
-PICS=($(find "${wallDIR}" -type f \( -iname \*.jpg -o -iname \*.jpeg -o -iname \*.png -o -iname \*.gif \)))
+# Retrieve image files using null delimiter to handle spaces in filenames
+mapfile -d '' PICS < <(find "${wallDIR}" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" -o -iname "*.gif" \) -print0)
+
 RANDOM_PIC="${PICS[$((RANDOM % ${#PICS[@]}))]}"
 RANDOM_PIC_NAME=". random"
 
 # Rofi command
 rofi_command="rofi -i -show -dmenu -config ~/.config/rofi/config-wallpaper.rasi"
 
-
 # Sorting Wallpapers
 menu() {
-  sorted_options=($(printf '%s\n' "${PICS[@]}" | sort))
+  # Sort the PICS array
+  IFS=$'\n' sorted_options=($(sort <<<"${PICS[*]}"))
+  
   # Place ". random" at the beginning with the random picture as an icon
   printf "%s\x00icon\x1f%s\n" "$RANDOM_PIC_NAME" "$RANDOM_PIC"
+  
   for pic_path in "${sorted_options[@]}"; do
     pic_name=$(basename "$pic_path")
     # Displaying .gif to indicate animated images
diff --git a/config/hypr/UserScripts/Weather.py b/config/hypr/UserScripts/Weather.py
index 1d2ea30b..c0a40fd7 100755
--- a/config/hypr/UserScripts/Weather.py
+++ b/config/hypr/UserScripts/Weather.py
@@ -63,12 +63,12 @@ temp_feel_text = f"Feels like {temp_feel}c"
 # min-max temperature
 temp_min = (
     html_data("div[data-testid='wxData'] > span[data-testid='TemperatureValue']")
-    .eq(0)
+    .eq(1)
     .text()
 )
 temp_max = (
     html_data("div[data-testid='wxData'] > span[data-testid='TemperatureValue']")
-    .eq(1)
+    .eq(0)
     .text()
 )
 temp_min_max = f"  {temp_min}\t\t  {temp_max}"
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 440ccb2f..af56bc18 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -60,8 +60,8 @@ label {
 # Hour-Time
 label {
     monitor =
-    text = cmd[update:1000] echo -e "$(date +"%H")"
-#    text = cmd[update:1000] echo -e "$(date +"%I")" #AM/PM
+    text = cmd[update:1000] echo "$(date +"%H")"
+#    text = cmd[update:1000] echo "$(date +"%I")" #AM/PM
     color = rgba(255, 185, 0, .6)
     font_size = 200
     font_family = JetBrains Mono Nerd Font Mono ExtraBold 
@@ -73,7 +73,7 @@ label {
 # Minute-Time
 label {
     monitor =
-    text = cmd[update:1000] echo -e "$(date +"%M")"
+    text = cmd[update:1000] echo "$(date +"%M")"
     color = rgba(255, 255, 255, .6)
     font_size = 200
     font_family = JetBrains Mono Nerd Font Mono ExtraBold
@@ -85,8 +85,8 @@ label {
 # Seconds-Time
 label {
     monitor =
-    text = cmd[update:1000] echo -e "$(date +"%S")"
-#    text = cmd[update:1000] echo -e "$(date +"%S %p")" #AM/PM
+    text = cmd[update:1000] echo "$(date +"%S")"
+#    text = cmd[update:1000] echo "$(date +"%S %p")" #AM/PM
     color = $color12
     font_size = 40
     font_family = JetBrains Mono Nerd Font Mono ExtraBold
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 28bf33ab..85e65322 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -8,7 +8,7 @@
 # Variables
 scriptsDir=$HOME/.config/hypr/scripts
 wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified
-waybar_style="$HOME/.config/waybar/style/[Wallust] Box type.css"
+waybar_style="$HOME/.config/waybar/style/[Dark] Half-Moon.css"
 kvantum_theme="Catppuccin-Mocha"
 color_scheme="prefer-dark"
 gtk_theme="Andromeda-dark"
diff --git a/config/hypr/v2.3.1 b/config/hypr/v2.3.2
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.3.1
+++ b/config/hypr/v2.3.2