From 011b3b556643c6a6e94af050a84b81fd6491ff46 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@telenet.be>
Date: Thu, 13 Oct 2022 14:42:58 +0200
Subject: [PATCH] Fixed autostart file

---
 config/sway/autostart    | 22 ----------------------
 config/sway/autostart.sh | 35 +++++++++++++++++++++++++++++++++++
 config/sway/config       |  9 ++++++---
 3 files changed, 41 insertions(+), 25 deletions(-)
 delete mode 100644 config/sway/autostart
 create mode 100755 config/sway/autostart.sh

diff --git a/config/sway/autostart b/config/sway/autostart
deleted file mode 100644
index 5abfdb3..0000000
--- a/config/sway/autostart
+++ /dev/null
@@ -1,22 +0,0 @@
-# 
-# ~/.config/sway/autostart
-# List of applications to autostart
-#
-
-# Move to this workspace on startup
-workspace 0:¯\_(ツ)_/¯
-
-# Idle script
-exec_always "~/.scripts/idle.sh"
-
-# Gamma and brightness
-exec clight &> /dev/null
-
-# Notification manager
-exec dunst -verbosity crit
-
-# Fix [Slow launch for some GTK apps](https://github.com/swaywm/sway/issues/5732)
-exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-
-# Fix JetBrain IDE's showing properly
-exec wmname LG3D
diff --git a/config/sway/autostart.sh b/config/sway/autostart.sh
new file mode 100755
index 0000000..f3dcf69
--- /dev/null
+++ b/config/sway/autostart.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# 
+# ~/.config/sway/autostart.sh
+# List of applications to autostart
+#
+
+function execute () {
+    setsid --fork $SHELL -c "${1}" &> /dev/null
+}
+
+# Idle script
+execute "~/.scripts/idle.sh"
+
+# Gamma and brightness
+execute "clight"
+
+# Notification manager
+execute "dunst -verbosity crit"
+
+# Fix [Slow launch for some GTK apps](https://github.com/swaywm/sway/issues/5732)
+dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+
+# Fix JetBrain IDE's showing properly
+wmname LG3
+
+
+sleep 3
+# --- Everything that requires tray to be active ---
+
+# Nextcloud client
+execute "nextcloud --background"
+
+# Activity watch server & client
+execute "aw-qt"
+
diff --git a/config/sway/config b/config/sway/config
index 5401e21..fa7493b 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -6,7 +6,6 @@
 
 # Import other config files
 include {
-    autostart
     commands
     modes
     style
@@ -43,7 +42,7 @@ output 'Samsung Electric Company SAMSUNG 0x00000001' {
 
 # Focus
 focus_follows_mouse no
-floating_modifier    Mod4 normal
+floating_modifier   Mod4 normal
 
 # Window rules
 for_window [window_role="pop-up"] floating enable
@@ -51,5 +50,9 @@ for_window [window_role="task_dialog"] floating enable
 
 for_window [class="Qalculate"] floating enable
 for_window [class="Caprine"] floating enable, border normal 2
-for_window [class="be.ugent"] floating enable               # IntelliJ Java programs
 for_window [title="^FZF-Jump$"] floating enable, border pixel 0, resize set 600 350
+
+for_window [class="^Betterbird$"] move container to workspace "11:Soc"
+
+exec "~/.config/sway/autostart.sh"
+