From f9fed41576e05def4281a0d7782de8a3e8fe1d68 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Mon, 2 Mar 2020 21:37:48 +0200
Subject: [PATCH] Move some sway stuff away from systemd

---
 home/.config/sway/conf.d/02-bar.conf                  |  6 ++++++
 .../sway/conf.d/{02-input.conf => 03-input.conf}      |  0
 .../sway/conf.d/{03-output.conf => 04-output.conf}    |  0
 .../conf.d/{04-workspaces.conf => 05-workspaces.conf} |  0
 .../conf.d/{05-keybinds.conf => 06-keybinds.conf}     |  0
 .../conf.d/{06-appearance.conf => 07-appearance.conf} |  0
 .../sway/conf.d/{07-exec.conf => 08-exec.conf}        | 11 ++++++++---
 home/Scripts/sway-exit.sh                             |  2 +-
 8 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 home/.config/sway/conf.d/02-bar.conf
 rename home/.config/sway/conf.d/{02-input.conf => 03-input.conf} (100%)
 rename home/.config/sway/conf.d/{03-output.conf => 04-output.conf} (100%)
 rename home/.config/sway/conf.d/{04-workspaces.conf => 05-workspaces.conf} (100%)
 rename home/.config/sway/conf.d/{05-keybinds.conf => 06-keybinds.conf} (100%)
 rename home/.config/sway/conf.d/{06-appearance.conf => 07-appearance.conf} (100%)
 rename home/.config/sway/conf.d/{07-exec.conf => 08-exec.conf} (69%)

diff --git a/home/.config/sway/conf.d/02-bar.conf b/home/.config/sway/conf.d/02-bar.conf
new file mode 100644
index 0000000..645edb4
--- /dev/null
+++ b/home/.config/sway/conf.d/02-bar.conf
@@ -0,0 +1,6 @@
+# vim:ft=i3config
+
+bar {
+	swaybar_command waybar
+	output eDP-1
+}
diff --git a/home/.config/sway/conf.d/02-input.conf b/home/.config/sway/conf.d/03-input.conf
similarity index 100%
rename from home/.config/sway/conf.d/02-input.conf
rename to home/.config/sway/conf.d/03-input.conf
diff --git a/home/.config/sway/conf.d/03-output.conf b/home/.config/sway/conf.d/04-output.conf
similarity index 100%
rename from home/.config/sway/conf.d/03-output.conf
rename to home/.config/sway/conf.d/04-output.conf
diff --git a/home/.config/sway/conf.d/04-workspaces.conf b/home/.config/sway/conf.d/05-workspaces.conf
similarity index 100%
rename from home/.config/sway/conf.d/04-workspaces.conf
rename to home/.config/sway/conf.d/05-workspaces.conf
diff --git a/home/.config/sway/conf.d/05-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf
similarity index 100%
rename from home/.config/sway/conf.d/05-keybinds.conf
rename to home/.config/sway/conf.d/06-keybinds.conf
diff --git a/home/.config/sway/conf.d/06-appearance.conf b/home/.config/sway/conf.d/07-appearance.conf
similarity index 100%
rename from home/.config/sway/conf.d/06-appearance.conf
rename to home/.config/sway/conf.d/07-appearance.conf
diff --git a/home/.config/sway/conf.d/07-exec.conf b/home/.config/sway/conf.d/08-exec.conf
similarity index 69%
rename from home/.config/sway/conf.d/07-exec.conf
rename to home/.config/sway/conf.d/08-exec.conf
index dbaa253..94996c8 100644
--- a/home/.config/sway/conf.d/07-exec.conf
+++ b/home/.config/sway/conf.d/08-exec.conf
@@ -1,9 +1,14 @@
 # vim:ft=i3config
 
 exec {
-	systemctl --user import-environment
-	systemctl --user start sway-session.target
-	"tail -f /tmp/sway.wob | wob"
+	$HOME/Scripts/swayidle.sh
+	autotiling
+	redshift-gtk -m wayland
+	telegram-desktop
+	kdeconnect-indicator 
+	thunderbird
+	mkfifo /tmp/sway.wob && tail -f /tmp/sway.wob | wob
+	mako
 }
 
 exec_always {
diff --git a/home/Scripts/sway-exit.sh b/home/Scripts/sway-exit.sh
index f25ab74..87f2890 100755
--- a/home/Scripts/sway-exit.sh
+++ b/home/Scripts/sway-exit.sh
@@ -23,7 +23,7 @@ case "$RESP" in
 		loginctl lock-session $(loginctl show-user $USER -p Sessions | cut -d'=' -f2)
 		;;
 	Exit)
-		systemctl --user stop sway
+		swaymsg exit
 		;;
 	*)
 		exit 1