Merge branch 'main' of github.com:pogmommy/dotfiles

328p1aa/home/.config/sway/config.d/display.d/328p1aa

@@ -1,14 +1,14 @@
   output DP-2 {
     scale 1
     mode 3440x1440@60Hz
-    bg $HOME/.config/sway/assets/wallpaper/DP-2/_default.jpg fill
+#    bg $HOME/.config/sway/assets/wallpaper/DP-2/_default.jpg fill
     pos 1440 950
   }
 
   output DP-3 {
     scale 0.75
     mode 1920x1080@60Hz
-    bg $HOME/.config/sway/assets/wallpaper/DP-3/_default.jpg fill
+#    bg $HOME/.config/sway/assets/wallpaper/DP-3/_default.jpg fill
     pos 1900 -490
   }
 
@@ -16,7 +16,7 @@
     scale 1.5
     mode 3840x2160@60Hz
     transform 270
-    bg $HOME/.config/sway/assets/wallpaper/HDMI-A-1/_default.jpg fill
+#    bg $HOME/.config/sway/assets/wallpaper/HDMI-A-1/_default.jpg fill
     pos 0 0
   }
 

de/home/.config/sway/scripts/sway-wallpaper

@@ -5,6 +5,7 @@ getpids() {
 }
 
 killpids() {
+  sleep 5
   for i in ${pids[@]};do
     kill "${i}" && echo "killed ${i}"
   done
@@ -16,14 +17,15 @@ getwpno() {
 }
 
 setbg() {
-  swaybg -i "$HOME/.config/sway/assets/wallpaper/${output}/${wpno}.jpg" -o "${output}" &
+#  swaybg -i "$HOME/.config/sway/assets/wallpaper/${output}/${wpno}.jpg" -o "${output}" &
+  swaymsg output "${output}" bg "$HOME/.config/sway/assets/wallpaper/${output}/${wpno}.jpg" fill
 }
 
 wpno_last="9"
 
 getpids
 
-output=$(swaymsg -t get_outputs | jq -r '.[] | {name} | "\(.name)"')
+output=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused) | {name} | "\(.name)"')
 workspace=$(swaymsg -t get_workspaces | jq -r '.[] | select(.focused) | {name} | "\(.name)"')
 getwpno "${workspace}"
 setbg "${output}" "${wpno}"