Merge branch 'JaKooLit:main' into fix-questions

8 files changed, 25 insertions, 19 deletions

diff --git a/config/hypr/UserConfigs/UserDecorAnimations.conf b/config/hypr/UserConfigs/UserDecorAnimations.conf
index ef43fd6e..954a1d40 100644
--- a/config/hypr/UserConfigs/UserDecorAnimations.conf
+++ b/config/hypr/UserConfigs/UserDecorAnimations.conf
@@ -19,12 +19,15 @@ decoration {
   dim_strength = 0.1
   dim_special = 0.8
 
-  drop_shadow = true
-  shadow_range = 6
-  shadow_render_power = 1
-  
-  col.shadow = $color12
-  col.shadow_inactive = 0x50000000
+  shadow {
+    enabled = true
+    range = 6
+    render_power = 1
+
+    color =  $color12
+    color_inactive = $color2
+  }
+
 
   blur {
     enabled = true	
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index 7d3645bc..ae0ab4b2 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -28,7 +28,7 @@ general {
   resize_on_border = true
    
   col.active_border = $color12 
-  col.inactive_border = $backgroundCol
+  col.inactive_border = $background
   
   layout = dwindle
 }
@@ -116,6 +116,7 @@ binds {
 
 #Could help when scaling and not pixelating
 xwayland {
+  enabled = true
   force_zero_scaling = true
 }
 
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 50ff065e..b3209475 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -72,6 +72,7 @@ windowrulev2 = float, class:^([Ff]erdium)$
 windowrulev2 = float, title:^(Picture-in-Picture)$
 windowrulev2 = float, title:^(ROG Control)$
 #windowrulev2 = float, title:^(Firefox)$
+windowrulev2 = float, title:^(hyprgui)$
 
 # windowrule v2 - opacity #enable as desired
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
@@ -117,8 +118,9 @@ windowrulev2 = size 60% 70%, class:^(file-roller|org.gnome.FileRoller)$
 windowrulev2 = size 60% 70%, class:^([Ww]hatsapp-for-linux)$
 windowrulev2 = size 60% 70%, class:^([Ff]erdium)$
 windowrulev2 = size 60% 70%, title:^(ROG Control)$
-#windowrulev2 = size 25% 25%, title:^(Picture-in-Picture)$  
+#windowrulev2 = size 25% 25%, title:^(Picture-in-Picture)$   
 #windowrulev2 = size 25% 25%, title:^(Firefox)$ 
+windowrulev2 = size 60% 70%, title:^(hyprgui)$
 
 # windowrule v2 - pinning
 windowrulev2 = pin,title:^(Picture-in-Picture)$
diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh
index cc6a5781..4edb6b8d 100755
--- a/config/hypr/UserScripts/WallpaperEffects.sh
+++ b/config/hypr/UserScripts/WallpaperEffects.sh
@@ -15,7 +15,7 @@ iDIR="$HOME/.config/swaync/images"
 # swww transition config
 FPS=60
 TYPE="wipe"
-DURATION=2
+DURATION=1.5
 BEZIER=".43,1.19,1,.4"
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION"
 
@@ -78,11 +78,11 @@ main() {
             # Execute swww command after image conversion
             swww img -o "$focused_monitor" "$wallpaper_output" $SWWW_PARAMS &
             # Wait for swww command to complete
-            wait $!
+            sleep 1.5
             # Wait for other commands to finish
             wallust run "$wallpaper_output" -s &
             # Wait for other commands to finish
-            wait $!
+            sleep 0.5
             # Refresh rofi, waybar, wallust palettes
             "${SCRIPTSDIR}/Refresh.sh"
             notify-send -u low -i "$iDIR/bell.png" "$choice effects applied"
diff --git a/config/hypr/UserScripts/WallpaperRandom.sh b/config/hypr/UserScripts/WallpaperRandom.sh
index 050c10c3..c3926906 100755
--- a/config/hypr/UserScripts/WallpaperRandom.sh
+++ b/config/hypr/UserScripts/WallpaperRandom.sh
@@ -21,8 +21,8 @@ SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration
 
 swww query || swww-daemon --format xrgb && swww img -o $focused_monitor ${RANDOMPICS} $SWWW_PARAMS
 
-
-${scriptsDir}/WallustSwww.sh
 sleep 1
+${scriptsDir}/WallustSwww.sh
+sleep 0.5
 ${scriptsDir}/Refresh.sh 
 
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 25ef30e9..23640995 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -11,7 +11,7 @@ focused_monitor=$(hyprctl monitors | awk '/^Monitor/{name=$2} /focused: yes/{pri
 # swww transition config
 FPS=60
 TYPE="any"
-DURATION=2
+DURATION=1.5
 BEZIER=".43,1.19,1,.4"
 SWWW_PARAMS="--transition-fps $FPS --transition-type $TYPE --transition-duration $DURATION"
 
@@ -69,9 +69,9 @@ main() {
   # Random choice case
   if [[ "$choice" == "$RANDOM_PIC_NAME" ]]; then
 	swww img -o "$focused_monitor" "$RANDOM_PIC" $SWWW_PARAMS;
-    sleep 0.5
+    sleep 1.5
     "$SCRIPTSDIR/WallustSwww.sh"
-    sleep 0.2
+    sleep 0.5
     "$SCRIPTSDIR/Refresh.sh"
     exit 0
   fi
@@ -102,9 +102,9 @@ fi
 
 main
 
-sleep 0.5
+sleep 1.5
 "$SCRIPTSDIR/WallustSwww.sh"
 
-sleep 0.2
+sleep 0.5
 "$SCRIPTSDIR/Refresh.sh"
 
diff --git a/config/hypr/scripts/WallustSwww.sh b/config/hypr/scripts/WallustSwww.sh
index dbf5c32f..62dde375 100755
--- a/config/hypr/scripts/WallustSwww.sh
+++ b/config/hypr/scripts/WallustSwww.sh
@@ -20,7 +20,7 @@ echo $cache_file
 # Check if the cache file exists for the current monitor output
 if [ -f "$cache_file" ]; then
     # Get the wallpaper path from the cache file
-    wallpaper_path=$(cat "$cache_file")
+    wallpaper_path=$(grep -v 'Lanczos3' "$cache_file" | head -n 1)
     echo $wallpaper_path
     # symlink the wallpaper to the location Rofi can access
     if ln -sf "$wallpaper_path" "$HOME/.config/rofi/.current_wallpaper"; then
diff --git a/config/hypr/v2.3.7 b/config/hypr/v2.3.8
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.3.7
+++ b/config/hypr/v2.3.8