fixup! walls: organize into one dir

2 files changed, 71 insertions, 1 deletions

diff --git a/walls/hyprpaper.sh b/walls/hyprpaper.sh
new file mode 100755
index 0000000..d71fe36
--- /dev/null
+++ b/walls/hyprpaper.sh
@@ -0,0 +1,70 @@
+#!/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)"
+
+# colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
+DELAY=1800
+
+while true; do
+    if hyprctl hyprpaper | grep invalid; then
+        echo -e "${RED}hyprpaper not running, launching it... - BEGIN${NC}"
+        hyprpaper &
+    fi
+    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
+
+    # make it wallpaper the already preloaded one and preload for next time
+    # hyprctl hyprpaper wallpaper ", $(hyprctl hyprpaper listloaded)"
+    # hyprctl hyprpaper unload $(hyprctl hyprpaper listloaded)
+
+    # hyprctl hyprpaper preload $wallpappath
+    # 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
+        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
+
+    # hyprctl hyprpaper unload $(hyprctl hyprpaper listloaded) || hyprctl hyprpaper unload all
+    # hyprctl hyprpaper preload $wallpappath
+    # hyprctl hyprpaper wallpaper ", $wallpappath"
+    # for hyprlock sake
+    if hyprctl hyprpaper; then
+        sleep $DELAY
+    else
+        echo -e "${RED}hyprpaper not running, skipping sleep - END${NC}"
+        hyprpaper &
+    fi
+done
diff --git a/walls/swww.sh b/walls/swww.sh
index ea66152..54c56b0 100755
--- a/walls/swww.sh
+++ b/walls/swww.sh
@@ -40,8 +40,8 @@ while true; do
 
 	# gdbus call --session --dest com.mitchellh.ghostty --object-path /com/mitchellh/ghostty --method org.gtk.Actions.Activate reload-config [] [] &
 	kitten @ action load_config_file
+	kitty @ set-colors --all --configured ~/.config/kitty/colors.conf
 
-    current_bg=$(cat $XDG_CACHE_HOME/current.bg)
     echo $wallpappath > $XDG_CACHE_HOME/current.bg
     # update hyprlock
     killall -SIGUSR2 hyprlock