From ef398f6e8860a984d7ea77f2aa71961ed9adb21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yaroslav=20de=20la=20Pe=C3=B1a=20Smirnov?=
 <yps@yaroslavps.com>
Date: Fri, 13 Jan 2023 22:45:35 +0300
Subject: Move cleanup from .profile to session script

Move cleanup after exiting sway to swaysession script.

Should find a better way to handle "runaway" programs after logout from
sway.
---
 dotfiles/.local/bin/swaysession | 10 ++++++++--
 dotfiles/.profile               |  8 +-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dotfiles/.local/bin/swaysession b/dotfiles/.local/bin/swaysession
index 2234c11..221ba0e 100755
--- a/dotfiles/.local/bin/swaysession
+++ b/dotfiles/.local/bin/swaysession
@@ -8,6 +8,10 @@ case "$1" in
         ;;
     logout)
         swaymsg exit
+        clear
+        if [ ! -e ~/.cache/dont-kill ]; then
+        	killall -u $(whoami)
+        fi
         ;;
     switch_user)
         dm-tool switch-to-greeter
@@ -19,11 +23,13 @@ case "$1" in
         lock-color & sleep 1 && $logind hibernate
         ;;
     reboot)
-        rm -f ~/.cache/openvpnpid
+        swaymsg exit
+        clear
         $logind reboot
         ;;
     poweroff)
-        rm -f ~/.cache/openvpnpid
+        swaymsg exit
+        clear
         $logind poweroff
         ;;
     *)
diff --git a/dotfiles/.profile b/dotfiles/.profile
index 00fed07..f3ff763 100644
--- a/dotfiles/.profile
+++ b/dotfiles/.profile
@@ -44,12 +44,6 @@ eval "$(dircolors "$HOME/.config/dir_colors")"
 
 # Start sway automatically upon login on tty1 or tty2
 if [ -z $DISPLAY ] && [ $(tty) = /dev/tty1 ] || [ $(tty) = /dev/tty2 ]; then
-	dbus-run-session sway
-	if [ $? = 0 ] && [ ! -e ~/.cache/dont-kill ]; then
-		killall -u $(whoami)
-		clear
-		exit
-	fi
-	mv ~/.cache/sway.log ~/.cache/sway-crash-$(date +"%Y-%m-%dT%H:%M").log
+	exec dbus-run-session sway 2> ~/.cache/sway.log
 fi
 
-- 
cgit v1.2.3