From daee02496aef7bf36e9f558bd1139d7fa0ef8e5a Mon Sep 17 00:00:00 2001
From: Penelope Gwen <pogmommypenny@gmail.com>
Date: Tue, 9 Apr 2024 21:45:02 -0600
Subject: [PATCH] New backup 2024-04-09 21:45:02

---
 de/home/.config/sway/scripts/autostart |  5 ++++-
 de/home/.config/sway/scripts/wallpaper | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/de/home/.config/sway/scripts/autostart b/de/home/.config/sway/scripts/autostart
index 524704f..49b4deb 100755
--- a/de/home/.config/sway/scripts/autostart
+++ b/de/home/.config/sway/scripts/autostart
@@ -9,6 +9,8 @@ killall swayidle
 killall kdeconnectd
 killall wlpaste
 killall polkit-gnome-authentication-agent-1
+killall swaybg
+killall $HOME/.config/sway/scripts/wallpaper
 
 autotiling & \
 waybar & \
@@ -18,4 +20,5 @@ swayidle & \
 blueman-applet & \
 wl-paste -t text --watch clipman store --max-items 1024 & \
 /home/pogmommy/.cargo/bin/batalert -u /sys/class/power_supply/macsmc-battery/uevent --alert 20 --notification-step 5 & \
-/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
+/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 & \
+$HOME/.config/sway/scripts/wallpaper
diff --git a/de/home/.config/sway/scripts/wallpaper b/de/home/.config/sway/scripts/wallpaper
index 0bfa1a0..64b5755 100755
--- a/de/home/.config/sway/scripts/wallpaper
+++ b/de/home/.config/sway/scripts/wallpaper
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-bgpid=""
+output=$(swaymsg -t get_outputs | jq -r '.[] | {name} | "\(.name)"')
+wsno=$(swaymsg -t get_workspaces | jq -r '.[] | select(.focused) | {name} | "\(.name)"' | awk '{print $1}' | grep -o "^[1-9]*")
+wpid=$(($(printf "%02d\n" $wsno)-1))
+wpid=$(echo "${wpid:0:1}")
+swaybg -i "$HOME/.config/sway/assets/wallpaper/${output}/${wpid}.jpg" -o "${output}" &
+bgpid=$!
 
 swaymsg -r -t subscribe -m '["workspace"]' | jq -rc --unbuffered 'select(.change == "focus") | .current | "\(.name) \(.output)"' | while read name output;do
   wsno=$(echo "$name" | awk '{print $1}' | grep -o "^[1-9]*")
@@ -24,6 +29,7 @@ echo "$HOME/.config/sway/assets/wallpaper/${output}/${wpid}.jpg"
   old_bgpid=$bgpid
   swaybg -i "$HOME/.config/sway/assets/wallpaper/${output}/${wpid}.jpg" -o "${output}" &
   bgpid=$!
-  kill $old_bgpid
-  bash -c "sleep 0.4;kill $old_bgpid" &
+#  bash -c "sleep 0.5;kill $old_bgpid" &
+  sleep 0.5
+  kill $old_bgpid & echo "killing $old_bgpid"
 done