From dca563ecd5417a4b19e610b13d7fc99783ee3c67 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Sun, 12 Jan 2025 00:18:03 -0600
Subject: [PATCH] sway | switch launcher

---
 home/gui/default.nix        | 2 +-
 home/gui/files/sway/ace     | 5 ++---
 home/gui/files/sway/default | 9 +++++----
 home/gui/files/sway/eve     | 9 +++++----
 home/gui/files/sway/loki    | 2 +-
 home/gui/files/sway/pocket2 | 9 +++++----
 home/gui/files/sway/smaug   | 5 ++---
 home/gui/files/sway/t2      | 4 +---
 8 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/home/gui/default.nix b/home/gui/default.nix
index 0eaf395..7f7caff 100644
--- a/home/gui/default.nix
+++ b/home/gui/default.nix
@@ -8,7 +8,7 @@ in {
       imports = [
         ./alacritty.nix
         ./autostart.nix
-        ./fuzzel.nix
+        # ./fuzzel.nix
         ./kde.nix
         ./mpv.nix
         ./redshift.nix
diff --git a/home/gui/files/sway/ace b/home/gui/files/sway/ace
index 04dcb04..3f682b9 100644
--- a/home/gui/files/sway/ace
+++ b/home/gui/files/sway/ace
@@ -4,6 +4,7 @@ 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"' \
@@ -65,7 +66,7 @@ set $menu dmenu-wl_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
 
 # rofi app and window launchers
-bindsym $mod+p exec $menu_command
+bindsym $mod+p exec --no-startup-id $menu
 bindsym menu exec $menu_command
 bindsym $mod+Shift+w exec dwifi
 bindsym $mod+d exec --no-startup-id $menu
@@ -339,8 +340,6 @@ 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 wl-paste -t text --watch clipman store
 exec configure-gtk
 exec sonixd
diff --git a/home/gui/files/sway/default b/home/gui/files/sway/default
index 62bf638..f2161cb 100644
--- a/home/gui/files/sway/default
+++ b/home/gui/files/sway/default
@@ -4,6 +4,7 @@ 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"' \
@@ -65,7 +66,7 @@ set $menu dmenu-wl_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
 
 # rofi app and window launchers
-bindsym $mod+p exec $menu_command
+bindsym $mod+p exec --no-startup-id $menu
 bindsym menu exec $menu_command
 bindsym $mod+Shift+w exec dwifi
 bindsym $mod+d exec --no-startup-id $menu
@@ -336,9 +337,9 @@ exec_always shikanectl reload
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-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 hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+exec --no-startup-id udiskie --tray
 exec wl-paste -t text --watch clipman store
 exec configure-gtk
 exec sonixd
diff --git a/home/gui/files/sway/eve b/home/gui/files/sway/eve
index c117bda..24667c9 100644
--- a/home/gui/files/sway/eve
+++ b/home/gui/files/sway/eve
@@ -4,6 +4,7 @@ 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"' \
@@ -65,7 +66,7 @@ set $menu dmenu-wl_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
 
 # rofi app and window launchers
-bindsym $mod+p exec $menu_command
+bindsym $mod+p exec --no-startup-id $menu
 bindsym menu exec $menu_command
 bindsym $mod+Shift+w exec dwifi
 bindsym $mod+d exec --no-startup-id $menu
@@ -336,9 +337,9 @@ exec_always shikanectl reload
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-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 hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+exec --no-startup-id udiskie --tray
 exec wl-paste -t text --watch clipman store
 exec configure-gtk
 exec sonixd
diff --git a/home/gui/files/sway/loki b/home/gui/files/sway/loki
index 85ea807..292109e 100644
--- a/home/gui/files/sway/loki
+++ b/home/gui/files/sway/loki
@@ -66,7 +66,7 @@ set $menu dmenu-wl_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
 
 # rofi app and window launchers
-bindsym $mod+p exec $menu_command
+bindsym $mod+p exec --no-startup-id $menu
 bindsym menu exec $menu_command
 bindsym $mod+Shift+w exec dwifi
 bindsym $mod+d exec --no-startup-id $menu
diff --git a/home/gui/files/sway/pocket2 b/home/gui/files/sway/pocket2
index 4af947e..cf508ab 100644
--- a/home/gui/files/sway/pocket2
+++ b/home/gui/files/sway/pocket2
@@ -4,6 +4,7 @@ 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"' \
@@ -65,7 +66,7 @@ set $menu dmenu-wl_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
 
 # rofi app and window launchers
-bindsym $mod+p exec $menu_command
+bindsym $mod+p exec --no-startup-id $menu
 bindsym menu exec $menu_command
 bindsym $mod+Shift+w exec dwifi
 bindsym $mod+d exec --no-startup-id $menu
@@ -336,9 +337,9 @@ exec_always shikanectl reload
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-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 hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+exec --no-startup-id udiskie --tray
 exec wl-paste -t text --watch clipman store
 exec configure-gtk
 exec sonixd
diff --git a/home/gui/files/sway/smaug b/home/gui/files/sway/smaug
index 04dcb04..3f682b9 100644
--- a/home/gui/files/sway/smaug
+++ b/home/gui/files/sway/smaug
@@ -4,6 +4,7 @@ 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"' \
@@ -65,7 +66,7 @@ set $menu dmenu-wl_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
 
 # rofi app and window launchers
-bindsym $mod+p exec $menu_command
+bindsym $mod+p exec --no-startup-id $menu
 bindsym menu exec $menu_command
 bindsym $mod+Shift+w exec dwifi
 bindsym $mod+d exec --no-startup-id $menu
@@ -339,8 +340,6 @@ 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 wl-paste -t text --watch clipman store
 exec configure-gtk
 exec sonixd
diff --git a/home/gui/files/sway/t2 b/home/gui/files/sway/t2
index fa2a8a5..48b1751 100644
--- a/home/gui/files/sway/t2
+++ b/home/gui/files/sway/t2
@@ -68,7 +68,7 @@ set $menu dmenu-wl_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
 
 # rofi app and window launchers
-bindsym $mod+p exec $menu_command
+bindsym $mod+p exec --no-startup-id $menu
 bindsym menu exec $menu_command
 bindsym $mod+Shift+w exec dwifi
 bindsym $mod+d exec --no-startup-id $menu
@@ -342,8 +342,6 @@ 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 wl-paste -t text --watch clipman store
 exec configure-gtk
 exec sonixd