From eb2de9e396ad82054971d23516e6a965ed7850c0 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Tue, 23 Jul 2024 08:02:37 -0500
Subject: [PATCH] sway config | enable wayland-pipewire-idle-inhibit & cleanup

---
 home/gui/files/sway/default | 17 ++++-------------
 home/gui/files/sway/eve     | 17 ++++-------------
 home/gui/files/sway/loki    |  8 +-------
 home/gui/files/sway/pocket2 | 17 ++++-------------
 home/gui/files/sway/smaug   |  9 +--------
 home/gui/files/sway/t2      |  8 +-------
 6 files changed, 15 insertions(+), 61 deletions(-)

diff --git a/home/gui/files/sway/default b/home/gui/files/sway/default
index 9bce230..50f0faa 100644
--- a/home/gui/files/sway/default
+++ b/home/gui/files/sway/default
@@ -4,7 +4,6 @@ set $terminal_path /home/don/bin/mynewterm
 set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle-00.iec958-stereo
 
 set $lock /home/don/bin/lock.sh
-exec_always sway-audio-idle-inhibit
 exec swayidle -w \
     timeout 300 $lock \
     timeout 360 'swaymsg "output * dpms off"' \
@@ -331,16 +330,14 @@ client.background       #F8F8F2
 exec pasystray
 exec_always keyctl link @u @s
 exec shikane
+exec wayland-pipewire-idle-inhibit
 exec_always shikanectl reload
-exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-
-exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec --no-startup-id udiskie --tray
-exec --no-startup-id gnome-flashback
-exec --no-startup-id dbus-send --session --print-reply=literal --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:sway" "string:$DESKTOP_AUTOSTART_ID"
+exec dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+exec udiskie --tray
+exec dbus-send --session --print-reply=literal --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:sway" "string:$DESKTOP_AUTOSTART_ID"
 exec wl-paste -t text --watch clipman store
 exec configure-gtk
 exec sonixd
@@ -349,16 +346,10 @@ exec auto-start
 exec swaync
 exec nm-applet
 exec randbg
-exec indicator-kdeconnect
 exec kdeconnect-indicator
 exec myweb
 exec myterm
-exec cbatticons
 exec headset-charge-indicator.py
 exec blueberry-tray
 exec ktimer
-exec kanshi
 exec wlsunset -l 29.74 -L -95.77
-exec powerkit
-exec poweralertd
-exec flameshot
diff --git a/home/gui/files/sway/eve b/home/gui/files/sway/eve
index e68a1c9..64e8ab4 100644
--- a/home/gui/files/sway/eve
+++ b/home/gui/files/sway/eve
@@ -4,7 +4,6 @@ set $terminal_path /home/don/bin/mynewterm
 set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle-00.iec958-stereo
 
 set $lock /home/don/bin/lock.sh
-exec_always sway-audio-idle-inhibit
 exec swayidle -w \
     timeout 300 $lock \
     timeout 360 'swaymsg "output * dpms off"' \
@@ -331,16 +330,14 @@ client.background       #F8F8F2
 exec pasystray
 exec_always keyctl link @u @s
 exec shikane
+exec wayland-pipewire-idle-inhibit
 exec_always shikanectl reload
-exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-
-exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec --no-startup-id udiskie --tray
-exec --no-startup-id gnome-flashback
-exec --no-startup-id dbus-send --session --print-reply=literal --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:sway" "string:$DESKTOP_AUTOSTART_ID"
+exec dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+exec udiskie --tray
+exec dbus-send --session --print-reply=literal --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:sway" "string:$DESKTOP_AUTOSTART_ID"
 exec wl-paste -t text --watch clipman store
 exec configure-gtk
 exec sonixd
@@ -349,16 +346,10 @@ exec auto-start
 exec swaync
 exec nm-applet
 exec randbg
-exec indicator-kdeconnect
 exec kdeconnect-indicator
 exec myweb
 exec myterm
-exec cbatticons
 exec headset-charge-indicator.py
 exec blueberry-tray
 exec ktimer
-exec kanshi
 exec wlsunset -l 29.74 -L -95.77
-exec powerkit
-exec poweralertd
-exec flameshot
diff --git a/home/gui/files/sway/loki b/home/gui/files/sway/loki
index b63ea04..f45ea16 100644
--- a/home/gui/files/sway/loki
+++ b/home/gui/files/sway/loki
@@ -331,8 +331,8 @@ client.background       #F8F8F2
 exec pasystray
 exec_always keyctl link @u @s
 exec shikane
+exec wayland-pipewire-idle-inhibit
 exec_always shikanectl reload
-exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
@@ -349,16 +349,10 @@ exec auto-start
 exec swaync
 exec nm-applet
 exec randbg
-exec indicator-kdeconnect
 exec kdeconnect-indicator
 exec myweb
 exec myterm
-exec cbatticons
 exec headset-charge-indicator.py
 exec blueberry-tray
 exec ktimer
-exec kanshi
 exec wlsunset -l 29.74 -L -95.77
-exec powerkit
-exec poweralertd
-exec flameshot
diff --git a/home/gui/files/sway/pocket2 b/home/gui/files/sway/pocket2
index ebc08f6..01f467b 100644
--- a/home/gui/files/sway/pocket2
+++ b/home/gui/files/sway/pocket2
@@ -4,7 +4,6 @@ set $terminal_path /home/don/bin/mynewterm
 set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle-00.iec958-stereo
 
 set $lock /home/don/bin/lock.sh
-exec_always sway-audio-idle-inhibit
 exec swayidle -w \
     timeout 300 $lock \
     timeout 360 'swaymsg "output * dpms off"' \
@@ -331,16 +330,14 @@ client.background       #F8F8F2
 exec pasystray
 exec_always keyctl link @u @s
 exec shikane
+exec wayland-pipewire-idle-inhibit
 exec_always shikanectl reload
-exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-
-exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec --no-startup-id udiskie --tray
-exec --no-startup-id gnome-flashback
-exec --no-startup-id dbus-send --session --print-reply=literal --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:sway" "string:$DESKTOP_AUTOSTART_ID"
+exec dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+exec udiskie --tray
+exec dbus-send --session --print-reply=literal --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:sway" "string:$DESKTOP_AUTOSTART_ID"
 exec wl-paste -t text --watch clipman store
 exec configure-gtk
 exec sonixd
@@ -349,16 +346,10 @@ exec auto-start
 exec swaync
 exec nm-applet
 exec randbg
-exec indicator-kdeconnect
 exec kdeconnect-indicator
 exec myweb
 exec myterm
-exec cbatticons
 exec headset-charge-indicator.py
 exec blueberry-tray
 exec ktimer
-exec kanshi
 exec wlsunset -l 29.74 -L -95.77
-exec powerkit
-exec poweralertd
-exec flameshot
diff --git a/home/gui/files/sway/smaug b/home/gui/files/sway/smaug
index 10f5db4..f5978d4 100644
--- a/home/gui/files/sway/smaug
+++ b/home/gui/files/sway/smaug
@@ -4,7 +4,6 @@ set $terminal_path /home/don/bin/mynewterm
 set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle-00.iec958-stereo
 
 set $lock /home/don/bin/lock.sh
-exec_always sway-audio-idle-inhibit
 exec swayidle -w \
     timeout 300 $lock \
     timeout 360 'swaymsg "output * dpms off"' \
@@ -331,8 +330,8 @@ client.background       #F8F8F2
 exec pasystray
 exec_always keyctl link @u @s
 exec shikane
+exec wayland-pipewire-idle-inhibit
 exec_always shikanectl reload
-exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
@@ -349,16 +348,10 @@ exec auto-start
 exec swaync
 exec nm-applet
 exec randbg
-exec indicator-kdeconnect
 exec kdeconnect-indicator
 exec myweb
 exec myterm
-exec cbatticons
 exec headset-charge-indicator.py
 exec blueberry-tray
 exec ktimer
-exec kanshi
 exec wlsunset -l 29.74 -L -95.77
-exec powerkit
-exec poweralertd
-exec flameshot
diff --git a/home/gui/files/sway/t2 b/home/gui/files/sway/t2
index a6dffc8..7e17be0 100644
--- a/home/gui/files/sway/t2
+++ b/home/gui/files/sway/t2
@@ -333,8 +333,8 @@ client.background       #F8F8F2
 exec pasystray
 exec_always keyctl link @u @s
 exec shikane
+exec wayland-pipewire-idle-inhibit
 exec_always shikanectl reload
-exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
@@ -351,16 +351,10 @@ exec auto-start
 exec swaync
 exec nm-applet
 exec randbg
-exec indicator-kdeconnect
 exec kdeconnect-indicator
 exec myweb
 exec myterm
-exec cbatticons
 exec headset-charge-indicator.py
 exec blueberry-tray
 exec ktimer
-exec kanshi
 exec wlsunset -l 29.74 -L -95.77
-exec powerkit
-exec poweralertd
-exec flameshot