Spend way too long fighting with wmii

8 files changed, 41 insertions, 9 deletions

diff --git a/.config/systemd/user/wm-running@.target.requires/wmii@.service b/.config/systemd/user/wm-running@.target.requires/wmii@.service
deleted file mode 120000
index 1b202d2..0000000
--- a/.config/systemd/user/wm-running@.target.requires/wmii@.service
+++ /dev/null
@@ -1 +0,0 @@
-../wmii@.service
\ No newline at end of file
diff --git a/.config/systemd/user/wm-running@.target.requires/wmiirc@.service b/.config/systemd/user/wm-running@.target.requires/wmiirc@.service
new file mode 120000
index 0000000..d763dce
--- /dev/null
+++ b/.config/systemd/user/wm-running@.target.requires/wmiirc@.service
@@ -0,0 +1 @@
+../wmiirc@.service
\ No newline at end of file
diff --git a/.config/systemd/user/wmii-proxy@.service b/.config/systemd/user/wmii-proxy@.service
new file mode 100644
index 0000000..1ef2b8f
--- /dev/null
+++ b/.config/systemd/user/wmii-proxy@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Socket activation helper for WMII on X display %I 
+Requires=wmii@%i.service
+After=wmii@%i.service
+BindsTo=wmii@%i.service
+
+[Service]
+ExecStart=/usr/lib/systemd/systemd-socket-proxyd %t/.wmii@%I.sock
diff --git a/.config/systemd/user/wmii@.service b/.config/systemd/user/wmii@.service
index 6707b9a..121a004 100644
--- a/.config/systemd/user/wmii@.service
+++ b/.config/systemd/user/wmii@.service
@@ -3,17 +3,12 @@ Description=Window Manager Improved Improved on X display %I
 Documentation=file:/usr/share/doc/wmii/wmii.pdf
 After=X11@%i.target
 Requisite=X11@%i.target
-Before=wm-running@%i.target
 
 [Service]
 Environment=DISPLAY=%I
 
-# This assumes that you write READY=1 to $NOTIFY_SOCKET in wmiirc
 Type=notify
 NotifyAccess=all
-
-ExecStart=/usr/bin/env bash -c 'exec 8>${XDG_RUNTIME_DIR}/x11-wm@%I; exec wmii'
-ExecStop=/usr/bin/env wmiir xwrite /ctl Quit
-
-[Install]
-RequiredBy=X11@%i.target
+ExecStart=/usr/bin/env bash -c 'exec 8>%t/x11-wm@%I; echo "$DISPLAY"; exec wmii -a unix!%t/.%N.sock -r ${XDG_CONFIG_HOME}/systemd/user/wmiirc'
+ExecStop=/usr/bin/env wmiir -a unix!%t/.%N.sock xwrite /ctl Quit
+ExecStopPost=/bin/rm -f -- %t/.%N.sock
diff --git a/.config/systemd/user/wmii@.service.wants/wmiirc@.service b/.config/systemd/user/wmii@.service.wants/wmiirc@.service
new file mode 120000
index 0000000..d763dce
--- /dev/null
+++ b/.config/systemd/user/wmii@.service.wants/wmiirc@.service
@@ -0,0 +1 @@
+../wmiirc@.service
\ No newline at end of file
diff --git a/.config/systemd/user/wmii@.socket b/.config/systemd/user/wmii@.socket
new file mode 100644
index 0000000..b1583a6
--- /dev/null
+++ b/.config/systemd/user/wmii@.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Window Manager Improved Improved on X display %I socket
+
+[Socket]
+ListenStream=%t/wmii@%I.sock
+Service=wmii-proxy@%i.service
+
+[Install]
+RequiredBy=X11@.target
diff --git a/.config/systemd/user/wmiirc b/.config/systemd/user/wmiirc
new file mode 100755
index 0000000..72f62b7
--- /dev/null
+++ b/.config/systemd/user/wmiirc
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo 'READY=1' | socat STDIO UNIX-SENDTO:"$NOTIFY_SOCKET"
+sleep infinity
diff --git a/.config/systemd/user/wmiirc@.service b/.config/systemd/user/wmiirc@.service
new file mode 100644
index 0000000..7c64cca
--- /dev/null
+++ b/.config/systemd/user/wmiirc@.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Window manager configuration on X display %I
+After=X11@%i.target wmii@%i.socket
+Requires=wmii@%i.socket
+Requisite=X11@%i.target
+
+Before=wm-running@%i.target
+
+[Service]
+
+Type=notify
+NotifyAccess=all
+ExecStopPost=/bin/rm -rf -- %t/wmii@%I/
+
+Environment=DISPLAY=%I WMII_ADDRESS=unix!%t/wmii@%I.sock
+ExecStart=/usr/bin/env WMII_CONFPATH=${XDG_CONFIG_HOME}/wmii-hg ${XDG_CONFIG_HOME}/wmii-hg/wmiirc