Merge branch 'JaKooLit:main' into fix-questions

11 files changed, 427 insertions, 20 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
diff --git a/config/rofi/config-wallpaper.rasi b/config/rofi/config-wallpaper.rasi
index fd00948e..2cfaa0e4 100644
--- a/config/rofi/config-wallpaper.rasi
+++ b/config/rofi/config-wallpaper.rasi
@@ -29,6 +29,7 @@ entry {
 listview {
   columns: 4;
   lines: 3;
+  flow: horizontal;
 }
 
 /* ---- Element ---- */
diff --git a/config/waybar/ModulesCustom b/config/waybar/ModulesCustom
index d0c8e506..fa989061 100644
--- a/config/waybar/ModulesCustom
+++ b/config/waybar/ModulesCustom
@@ -136,7 +136,7 @@
 "custom/swaync": {
 	"tooltip": true,
 	"tooltip-format": "Left Click: Launch Notification Center\nRight Click: Do not Disturb",
-	"format": "{} {icon}",
+	"format": "{} {icon} ",
 	"format-icons": {
 		"notification": "<span foreground='red'><sup></sup></span>",
 		"none": "",
diff --git a/config/waybar/style/[Colorful] Oglo Chicklets.css b/config/waybar/style/[Colorful] Oglo Chicklets.css
new file mode 100644
index 00000000..e8044bbe
--- /dev/null
+++ b/config/waybar/style/[Colorful] Oglo Chicklets.css
@@ -0,0 +1,400 @@
+* {
+    font-family: JetBrainsMono Nerd Font, FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    font-size: 97%;
+    font-weight: bold;
+}
+
+window#waybar {
+    background-color: #232a2e;
+    border-bottom: 8px solid #1d2327;
+    color: #d3c6aa;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+/*
+window#waybar.empty {
+    background-color: transparent;
+}
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+*/
+
+button {
+    all: unset;
+    background-color: #778f52;
+    color: #2d353b;
+    border: none;
+    border-bottom: 8px solid #5d743e;
+    border-radius: 5px;
+    padding-left: 15px;
+    padding-right: 15px;
+    transition: transform 0.1s ease-in-out;
+}
+
+button:hover {
+    background: inherit;
+    background-color: #92ab6c;
+    border-bottom: 8px solid #788f57;
+}
+
+button.active {
+    background: inherit;
+    background-color: #a5be7e;
+    border-bottom: 8px solid #8aa168;
+}
+
+#mode {
+    background-color: #64727D;
+    border-bottom: 3px solid #ffffff;
+}
+
+#backlight,
+#backlight-slider,
+#battery,
+#bluetooth,
+#clock,
+#cpu,
+#disk,
+#idle_inhibitor,
+#keyboard-state,
+#memory,
+#mode,
+#mpris,
+#network,
+#power-profiles-daemon,
+#pulseaudio,
+#pulseaudio-slider,	
+#taskbar,
+#temperature,
+#tray,
+#window,
+#wireplumber,
+#workspaces,
+#custom-backlight,
+#custom-browser,
+#custom-cava_mviz,
+#custom-cycle_wall,
+#custom-file_manager,
+#custom-keybinds,
+#custom-keyboard,
+#custom-light_dark,
+#custom-lock,
+#custom-hint,
+#custom-hypridle,
+#custom-menu,
+#custom-power_vertical,
+#custom-power,
+#custom-settings,
+#custom-spotify,
+#custom-swaync,
+#custom-tty,
+#custom-updater,
+#custom-weather,
+#custom-weather.clearNight,
+#custom-weather.cloudyFoggyDay,
+#custom-weather.cloudyFoggyNight,
+#custom-weather.default, 
+#custom-weather.rainyDay,
+#custom-weather.rainyNight,
+#custom-weather.severe,
+#custom-weather.showyIcyDay,
+#custom-weather.snowyIcyNight,
+#custom-weather.sunnyDay{
+    color: #ffffff;
+    border-radius: 5px;
+	padding-left: 5px;
+	padding-right: 5px;
+}
+
+#window,
+#workspaces {
+    margin: 0 4px;
+}
+
+/* If workspaces is the leftmost module, omit left margin */
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+/* If workspaces is the rightmost module, omit right margin */
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+#window {
+    background-color: #343f44;
+    color: #d3c6aa;
+    border-bottom: 8px solid #2b3539;
+}
+
+#custom-swaync {
+    background-color: #778f52;
+    color: #2d353b;
+    border-bottom: 8px solid #5d743e;
+}
+
+#custom-menu {
+    background-color: #778f52;
+    color: #2d353b;
+    border-bottom: 8px solid #5d743e;
+}
+
+#custom-power {
+    background-color: #ee606a;
+    color: #2d353b;
+    border-bottom: 8px solid #ca4853;
+    padding-left: 10px;
+}
+
+#custom-power_vertical{
+    background-color: #ee606a;
+    color: #2d353b;
+    border-bottom: 8px solid #ca4853;
+}
+
+#clock {
+    background-color: #96a84c;
+    color: #2d353b;
+    border-bottom: 8px solid #7a8c37;
+}
+
+#battery {
+    background-color: #3a998f;
+    color: #2d353b;
+    border-bottom: 8px solid #227d74;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #ee606a;
+    color: #2d353b;
+    border-bottom: 8px solid #ca4853;
+}
+
+label:focus {
+    background-color: #000000;
+}
+
+#cpu {
+    background-color: #778f52;
+    color: #2d353b;
+    border-bottom: 8px solid #5d743e;
+}
+
+#memory {
+    background-color: #d980ad;
+    color: #2d353b;
+    border-bottom: 8px solid #b86790;
+}
+
+#disk {
+    background-color: #964B00;
+    border-bottom: 8px solid #793300;
+}
+
+#custom-lock,
+#custom-light_dark,
+#backlight {
+    background-color: #64b6ac;
+    color: #2d353b;
+    border-bottom: 8px solid #4f9990;
+    padding-left: 10px;
+}
+
+#network {
+    background-color: #2980b9;
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
+#pulseaudio {
+    background-color: #d8ac47;
+    color: #2d353b;
+    border-bottom: 8px solid #b78f30;
+}
+
+#pulseaudio.muted {
+    background-color: #90b1b1;
+    color: #2a5c45;
+}
+
+#wireplumber {
+    background-color: #fff0f5;
+    color: #000000;
+}
+
+#wireplumber.muted {
+    background-color: #f53c3c;
+}
+
+#custom-media {
+    background-color: #66cc99;
+    color: #2a5c45;
+    min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+    background-color: #66cc99;
+}
+
+#custom-media.custom-vlc {
+    background-color: #ffa000;
+}
+
+#temperature {
+    background-color: #f0932b;
+    border-bottom: 8px solid #b78f30;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    background-color: #e67f51;
+    color: #2d353b;;
+    border-bottom: 8px solid #c3653b;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
+
+#mpd {
+    background-color: #66cc99;
+    color: #2a5c45;
+}
+
+#mpd.disconnected {
+    background-color: #f53c3c;
+}
+
+#mpd.stopped {
+    background-color: #90b1b1;
+}
+
+#mpd.paused {
+    background-color: #51a37a;
+}
+
+#language {
+    background: #00b093;
+    color: #740864;
+    min-width: 16px;
+}
+
+#keyboard-state {
+    background: #97e1ad;
+    color: #000000;
+    min-width: 16px;
+    border-bottom: 8px solid #78b48a;
+}
+
+#keyboard-state > label {
+    padding: 0 5px;
+}
+
+#keyboard-state > label.locked {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad {
+    background: rgba(0, 0, 0, 0.2);
+}
+
+#scratchpad.empty {
+	background-color: transparent;
+}
+
+tooltip {
+  background-color: #232a2e;
+  border: none;
+  border-bottom: 8px solid #1d2327;
+}
+
+tooltip decoration {
+  box-shadow: none;
+}
+
+tooltip decoration:backdrop {
+  box-shadow: none;
+}
+
+tooltip label {
+  color: #d3c6aa;
+  padding-left: 5px;
+  padding-right: 5px;
+  padding-top: 0px;
+  padding-bottom: 5px;
+}
+
+
+#pulseaudio-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#pulseaudio-slider trough {
+	background-color: #7f849c;
+	min-width: 80px;
+	min-height: 5px;
+	border-radius: 5px;
+}
+
+#pulseaudio-slider highlight {
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider slider {
+	min-width: 0px;
+	min-height: 0px;
+	opacity: 0;
+	background-image: none;
+	border: none;
+	box-shadow: none;
+}
+
+#backlight-slider trough {
+	background-color: #7f849c;
+	min-width: 80px;
+	min-height: 10px;
+	border-radius: 5px;
+}
+
+#backlight-slider highlight {
+	min-width: 10px;
+	border-radius: 5px;
+}