From 7e49678660c57cdfa3e7ef6e91ce89ab18b079c1 Mon Sep 17 00:00:00 2001
From: Luca Bilke <luca@bil.ke>
Date: Sun, 4 Feb 2024 12:29:27 +0100
Subject: [PATCH] new autostart mechanism

---
 .local/libexec/dwm/autostart.d/20gpgagent     |  2 ++
 .local/libexec/dwm/autostart.d/20pipewire     |  2 ++
 .local/libexec/dwm/autostart.d/30dunst        |  2 ++
 .../30xsecurelock}                            | 25 -------------------
 .local/libexec/dwm/autostart.d/40dwmblocks    |  2 ++
 .local/libexec/dwm/autostart.d/40unclutter    |  2 ++
 .local/libexec/dwm/autostart.d/50runsvdir     |  2 ++
 .local/libexec/dwm/autostart.d/90lf           |  2 ++
 .local/libexec/dwm/autostart.d/90setup        |  3 +++
 .../libexec/dwm/autostart.d/90syncthingtray   |  2 ++
 .local/sv/syncthing/run                       |  2 +-
 11 files changed, 20 insertions(+), 26 deletions(-)
 create mode 100755 .local/libexec/dwm/autostart.d/20gpgagent
 create mode 100755 .local/libexec/dwm/autostart.d/20pipewire
 create mode 100755 .local/libexec/dwm/autostart.d/30dunst
 rename .local/libexec/dwm/{autostart.sh => autostart.d/30xsecurelock} (59%)
 create mode 100755 .local/libexec/dwm/autostart.d/40dwmblocks
 create mode 100755 .local/libexec/dwm/autostart.d/40unclutter
 create mode 100755 .local/libexec/dwm/autostart.d/50runsvdir
 create mode 100755 .local/libexec/dwm/autostart.d/90lf
 create mode 100755 .local/libexec/dwm/autostart.d/90setup
 create mode 100755 .local/libexec/dwm/autostart.d/90syncthingtray

diff --git a/.local/libexec/dwm/autostart.d/20gpgagent b/.local/libexec/dwm/autostart.d/20gpgagent
new file mode 100755
index 00000000..25c9c3a7
--- /dev/null
+++ b/.local/libexec/dwm/autostart.d/20gpgagent
@@ -0,0 +1,2 @@
+#!/bin/sh
+gpgconf --launch gpg-agent
diff --git a/.local/libexec/dwm/autostart.d/20pipewire b/.local/libexec/dwm/autostart.d/20pipewire
new file mode 100755
index 00000000..36f74019
--- /dev/null
+++ b/.local/libexec/dwm/autostart.d/20pipewire
@@ -0,0 +1,2 @@
+#!/bin/sh
+pipewire
diff --git a/.local/libexec/dwm/autostart.d/30dunst b/.local/libexec/dwm/autostart.d/30dunst
new file mode 100755
index 00000000..039e710e
--- /dev/null
+++ b/.local/libexec/dwm/autostart.d/30dunst
@@ -0,0 +1,2 @@
+#!/bin/sh
+dunst
diff --git a/.local/libexec/dwm/autostart.sh b/.local/libexec/dwm/autostart.d/30xsecurelock
similarity index 59%
rename from .local/libexec/dwm/autostart.sh
rename to .local/libexec/dwm/autostart.d/30xsecurelock
index 50daceba..6c45bd7b 100755
--- a/.local/libexec/dwm/autostart.sh
+++ b/.local/libexec/dwm/autostart.d/30xsecurelock
@@ -1,14 +1,4 @@
 #!/bin/sh
-# This script is executed by DWM on start.
-
-SIGINT=2 SIGTERM=15
-trap 'trap - SIGTERM && kill -- -$$' $SIGINT $SIGTERM EXIT
-
-start() {
-    pidof -sx "$1" || "$@" &
-}
-
-# Set up xsecurelock
 xset s 300
 env \
     XSECURELOCK_AUTH_BACKGROUND_COLOR="#24283b" \
@@ -27,18 +17,3 @@ env \
     XSECURELOCK_SHOW_USERNAME=1 \
     XSECURELOCK_SHOW_HOSTNAME=1 \
     xss-lock -n /usr/libexec/xsecurelock/dimmer -l -- sh -c "xsecurelock -- playerctl pause || kill -9 -1" &
-
-[ -r "$XDG_CONFIG_HOME/dwm/host.sh" ] && "$XDG_CONFIG_HOME/dwm/host.sh" &
-
-xwallpaper --zoom "$XDG_DATA_HOME/bg"
-remaps -qd
-
-start unclutter -noevents &
-start gpgconf --launch gpg-agent
-start picom
-start pipewire
-start dunst
-start checkup
-start syncthingtray
-
-killall dwmblocks; env PATH="$HOME/.local/libexec/statusbar:$PATH" dwmblocks &
diff --git a/.local/libexec/dwm/autostart.d/40dwmblocks b/.local/libexec/dwm/autostart.d/40dwmblocks
new file mode 100755
index 00000000..122ded8a
--- /dev/null
+++ b/.local/libexec/dwm/autostart.d/40dwmblocks
@@ -0,0 +1,2 @@
+#!/bin/sh
+env PATH="$HOME/.local/libexec/statusbar:$PATH" dwmblocks
diff --git a/.local/libexec/dwm/autostart.d/40unclutter b/.local/libexec/dwm/autostart.d/40unclutter
new file mode 100755
index 00000000..461a5e4d
--- /dev/null
+++ b/.local/libexec/dwm/autostart.d/40unclutter
@@ -0,0 +1,2 @@
+#!/bin/sh
+unclutter -noevents -idle 3
diff --git a/.local/libexec/dwm/autostart.d/50runsvdir b/.local/libexec/dwm/autostart.d/50runsvdir
new file mode 100755
index 00000000..ae3b7697
--- /dev/null
+++ b/.local/libexec/dwm/autostart.d/50runsvdir
@@ -0,0 +1,2 @@
+#!/bin/sh
+runsvdir $SVDIR
diff --git a/.local/libexec/dwm/autostart.d/90lf b/.local/libexec/dwm/autostart.d/90lf
new file mode 100755
index 00000000..2c2b483a
--- /dev/null
+++ b/.local/libexec/dwm/autostart.d/90lf
@@ -0,0 +1,2 @@
+#!/bin/sh
+lf -server
diff --git a/.local/libexec/dwm/autostart.d/90setup b/.local/libexec/dwm/autostart.d/90setup
new file mode 100755
index 00000000..28f6e883
--- /dev/null
+++ b/.local/libexec/dwm/autostart.d/90setup
@@ -0,0 +1,3 @@
+#!/bin/sh
+xwallpaper --zoom "$XDG_DATA_HOME/bg"
+remaps -qd
diff --git a/.local/libexec/dwm/autostart.d/90syncthingtray b/.local/libexec/dwm/autostart.d/90syncthingtray
new file mode 100755
index 00000000..39b8b77d
--- /dev/null
+++ b/.local/libexec/dwm/autostart.d/90syncthingtray
@@ -0,0 +1,2 @@
+#!/bin/sh
+syncthingtray
diff --git a/.local/sv/syncthing/run b/.local/sv/syncthing/run
index 80d93647..373e9ae0 100755
--- a/.local/sv/syncthing/run
+++ b/.local/sv/syncthing/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 
-exec syncthing --no-browser --logfile="$HOME/.local/log/syncthing.log" >/dev/null
+exec syncthing --no-browser >/dev/null