aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--dot_config/sway/config4
-rw-r--r--dot_config/systemd/user/signal.service5
2 files changed, 7 insertions, 2 deletions
diff --git a/dot_config/sway/config b/dot_config/sway/config
index c1d897f..808e82d 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -201,8 +201,8 @@ bindsym $mod+t exec ~/.config/sway/tb-toggle.sh
# Managed by waybar.service (pulled in via sway-session.target).
# ── Autostart ─────────────────────────────────────────────────────────────────
-exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
-exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
+exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP
+exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP
exec "sleep 2 && ~/.config/sway/display-toggle.sh init"
exec systemctl --user start sway-session.target
exec ~/.config/sway/tb-autostart.sh
diff --git a/dot_config/systemd/user/signal.service b/dot_config/systemd/user/signal.service
index 80d25f2..264eb6e 100644
--- a/dot_config/systemd/user/signal.service
+++ b/dot_config/systemd/user/signal.service
@@ -7,8 +7,13 @@ ConditionEnvironment=WAYLAND_DISPLAY
[Service]
Type=simple
ExecStart=/usr/bin/flatpak run org.signal.Signal --start-in-tray
+# Electron + "minimize to tray" turns SIGTERM into a window-close which
+# hides instead of exits, so systemd would wait for the stop timeout
+# before SIGKILLing. Use flatpak's instance manager to kill it directly.
+ExecStop=/usr/bin/flatpak kill org.signal.Signal
Restart=on-failure
RestartSec=5s
+TimeoutStopSec=10s
[Install]
WantedBy=sway-session.target