2 files changed, 4 insertions, 8 deletions

diff --git a/src/firefox@.service b/src/firefox@.service
index afdce8f..411f79b 100644
--- a/src/firefox@.service
+++ b/src/firefox@.service
@@ -1,18 +1,14 @@
 [Unit]
 Description = Firefox
-# Requires=ioslay@%I
-# Requires=pulseaudio.socket # require X11 somehow
-ConditionUser = !root # seems reasonable
+ConditionUser = !root
 ConditionEnvironment = DISPLAY
+Wants = ioslay@%i.service
 
 [Service]
-ExecStartPre = /usr/bin/systemctl --user start ioslay@%I
-ExecStart = /usr/local/bin/firefox --new-instance --display=%I
-ExecStopPost = /usr/bin/systemctl --user stop ioslay@%I
+ExecStart = /usr/local/bin/firefox --new-instance --display=%i
 Restart = on-failure
 PassEnvironment = DISPLAY XAUTHORITY
 MemoryMax = 50%
 
 [Install]
 Also=ioslay@.service
-WantedBy = default.target # make an X11 user target?
diff --git a/src/ioslay@.service b/src/ioslay@.service
index 11db192..81c41d4 100644
--- a/src/ioslay@.service
+++ b/src/ioslay@.service
@@ -1,6 +1,6 @@
 [Unit]
 Description = Kill firefox when it spins the disk
-Requires = firefox@%I
+Requires = firefox@%i.service
 
 [Service]
 ExecStart = /usr/local/bin/firefox-io-slayer %I