hyprpaper -> swww

3 files changed, 73 insertions, 7 deletions

diff --git a/hypridle.sh b/hypridle.sh
index f903cad..e88ef50 100755
--- a/hypridle.sh
+++ b/hypridle.sh
@@ -37,7 +37,8 @@ function idle() {
     if [ $pmusic ]; then
         playerctl --all-players pause
     fi
-    killall -STOP hyprpaper.sh
+    # killall -STOP hyprpaper.sh
+    killall -STOP swww.sh
     brillio -O
     brillio -S 0
 }
@@ -64,7 +65,8 @@ function stopidle() {
         playerctl play -p spotify
         unset m
     fi
-    killall -CONT hyprpaper.sh || $HOME/scripts/hyprpaper.sh &
+    # killall -CONT hyprpaper.sh || $HOME/scripts/hyprpaper.sh &
+    killall -CONT swww.sh || $HOME/scripts/swww.sh &
     rm -f $XDG_CACHE_HOME/playing-music
     brillio -I
 }
diff --git a/hyprpaper.sh b/hyprpaper.sh
index 5091d66..d71fe36 100755
--- a/hyprpaper.sh
+++ b/hyprpaper.sh
@@ -14,7 +14,7 @@ NC='\033[0m'
 DELAY=1800
 
 while true; do
-    if ! hyprctl hyprpaper; then
+    if hyprctl hyprpaper | grep invalid; then
         echo -e "${RED}hyprpaper not running, launching it... - BEGIN${NC}"
         hyprpaper &
     fi
@@ -31,10 +31,21 @@ while true; do
     # hyprctl hyprpaper unload $(hyprctl hyprpaper listloaded)
 
     # hyprctl hyprpaper preload $wallpappath
-    while ! hyprctl hyprpaper wallpaper ", $(cat $XDG_CACHE_HOME/current.bg)"; do hyprctl hyprpaper preload $(cat $XDG_CACHE_HOME/current.bg); done
-    # update hyprlock
-    killall -SIGUSR2 hyprlock
-    hyprctl hyprpaper unload $(cat $XDG_CACHE_HOME/current.bg) || hyprctl hyprpaper unload all
+    # while ! hyprctl hyprpaper wallpaper ", $(cat $XDG_CACHE_HOME/current.bg)"; do hyprpaper & hyprctl hyprpaper preload $(cat $XDG_CACHE_HOME/current.bg); done
+    tmpreturn=$(hyprctl hyprpaper wallpaper ", $(cat $XDG_CACHE_HOME/current.bg)")
+    while ! hyprctl hyprpaper listactive | grep $(cat $XDG_CACHE_HOME/current.bg); do
+        if [[ $tmpreturn == *"preload"* ]]; then
+            echo -e "${RED}preload failed, retrying...${NC}"
+            hyprctl hyprpaper preload $(cat $XDG_CACHE_HOME/current.bg)
+            tmpreturn=$(hyprctl hyprpaper wallpaper ", $(cat $XDG_CACHE_HOME/current.bg)")
+        elif [[ $tmpreturn != "ok" ]]; then
+            echo -e "${RED}wallpaper failed, re(try) launching hyprpaper and retrying...${NC}"
+            echo -e "${RED}failed with: $tmpreturn${NC}"
+            hyprpaper &
+            tmpreturn=$(hyprctl hyprpaper wallpaper ", $(cat $XDG_CACHE_HOME/current.bg)")
+        fi
+    done
+    hyprctl hyprpaper unload $(cat $XDG_CACHE_HOME/current.bg) | grep "ok" ||  hyprctl hyprpaper unload all
     hyprctl hyprpaper preload $wallpappath
     current_bg=$(cat $XDG_CACHE_HOME/current.bg)
     if [[ $current_bg == *.jpg ]]; then
@@ -43,6 +54,8 @@ while true; do
         cp $current_bg $XDG_CACHE_HOME/bg.png
     fi
     echo $wallpappath > $XDG_CACHE_HOME/current.bg
+    # update hyprlock
+    killall -SIGUSR2 hyprlock
 
     # hyprctl hyprpaper unload $(hyprctl hyprpaper listloaded) || hyprctl hyprpaper unload all
     # hyprctl hyprpaper preload $wallpappath
@@ -52,5 +65,6 @@ while true; do
         sleep $DELAY
     else
         echo -e "${RED}hyprpaper not running, skipping sleep - END${NC}"
+        hyprpaper &
     fi
 done
diff --git a/swww.sh b/swww.sh
new file mode 100755
index 0000000..c065871
--- /dev/null
+++ b/swww.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+XDG_PICTURES_DIR="${XDG_PICTURES_DIR:-$HOME/Pictures}"
+XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
+XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+WALLPAPERS="$XDG_PICTURES_DIR/wallpapers/"
+current_bg="$(cat $XDG_CACHE_HOME/current.bg)"
+swwwarg="--transition-type random --transition-step 240 --transition-angle 0 --transition-duration 0.85 --transition-fps 160 --transition-bezier 1,0.33,0.3,1"
+
+# colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
+DELAY=1800
+
+while true; do
+    (while ! swww query; do swww-daemon; done) &
+    wallpappath=$(find "$WALLPAPERS" | shuf -n 1)
+    if ! [ $current_bg ]; then
+        echo -e "${RED}current.bg not set, setting it to $wallpappath${NC}"
+        echo $wallpappath > $XDG_CACHE_HOME/current.bg
+        echo -e "${GREEN}Regenerating wallpappath${NC}"
+        wallpappath=$(find "$WALLPAPERS" | shuf -n 1)
+    fi
+
+    # wallust run --skip-sequences $(cat $XDG_CACHE_HOME/current.bg)
+    wallust run --backend kmeans --skip-sequences $(cat $XDG_CACHE_HOME/current.bg) &
+    swww img $(cat $XDG_CACHE_HOME/current.bg) $swwwarg
+    wallust run --backend full --skip-sequences $(cat $XDG_CACHE_HOME/current.bg)
+
+    swaync-client --reload-css
+
+    current_bg=$(cat $XDG_CACHE_HOME/current.bg)
+    if [[ $current_bg == *.jpg ]]; then
+        magick convert $current_bg $XDG_CACHE_HOME/bg.png &
+    else
+        cp $current_bg $XDG_CACHE_HOME/bg.png
+    fi
+    echo $wallpappath > $XDG_CACHE_HOME/current.bg
+    # update hyprlock
+    killall -SIGUSR2 hyprlock
+
+    if swww query; then
+        sleep $DELAY
+    else
+        echo -e "${RED}swww not running, skipping sleep - END${NC}"
+        swww-daemon &
+    fi
+done