systemd: Add and use wm@$DISPLAY.target

wm@.target to change the default window manager. Create wm@$DISPLAY to
override for a particular display

4 files changed, 10 insertions, 2 deletions

diff --git a/.config/systemd/user/lxpanel@.service b/.config/systemd/user/lxpanel@.service
index 3327ab4..fa4dcb4 100644
--- a/.config/systemd/user/lxpanel@.service
+++ b/.config/systemd/user/lxpanel@.service
@@ -2,6 +2,7 @@
 Description=LXDE Desktop Panel
 Documentation=man:lxpanel(1)
 StopWhenUnneeded=true
+After=wm@%i.target
 
 [Service]
 Type=simple
diff --git a/.config/systemd/user/wm@.target b/.config/systemd/user/wm@.target
new file mode 100644
index 0000000..ac91fa1
--- /dev/null
+++ b/.config/systemd/user/wm@.target
@@ -0,0 +1,3 @@
+[Unit]
+Description=Window Manager on display %I
+Requires=wmii@%i.service
diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service
index 3902627..602bdb8 100644
--- a/.config/systemd/user/wmii@.service
+++ b/.config/systemd/user/wmii@.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=Window Manager Improved Improved
 Documentation=file:/usr/share/doc/wmii/wmii.pdf
+Before=wm@%i.target
+StopWhenUnneeded=true
 
 [Service]
-Type=simple
-Restart=no
+# This assumes that you write READY=1 to $NOTIFY_SOCKET in wmiirc
+Type=notify
+NotifyAccess=all
 
 Environment=DISPLAY=%I
 ExecStart=/usr/bin/bash -l -c 'exec 8>${XDG_RUNTIME_DIR}/x11-wm@%I; exec /usr/bin/wmii'
diff --git a/.config/systemd/user/x0vncserver@.service b/.config/systemd/user/x0vncserver@.service
index 02165a7..21a3b7b 100644
--- a/.config/systemd/user/x0vncserver@.service
+++ b/.config/systemd/user/x0vncserver@.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=VNC server for X displays
 Conflicts=vncserver@%i.service
+StopWhenUnneeded=true
 
 [Service]
 Type=simple