4 files changed, 17 insertions, 14 deletions
diff --git a/user/compton.service b/user/compton.service
index 8b313b5..a8ceb7e 100644
--- a/user/compton.service
+++ b/user/compton.service
@@ -2,12 +2,15 @@
 Description=Compton X Compositor
 After=display-manager.service local-fs.target
 ConditionFileIsExecutable=/usr/bin/compton
-ConditionFileNotEmpty=/sys/kernel/realtime
+ConditionFileIsExecutable=/usr/bin/xset
+ConditionFileNotEmpty=!/sys/kernel/realtime
 
 [Service]
 Type=forking
+ExecStartPre=/usr/bin/sh -c '/usr/bin/xset q 2>&1 > /dev/null'
 ExecStart=/usr/bin/compton --config %h/.config/compton.conf -b
 Restart=always
+RestartSec=3s
 
 [Install]
 WantedBy=default.target
diff --git a/user/conky@.service b/user/conky@.service
new file mode 100644
index 0000000..9e0323e
--- /dev/null
+++ b/user/conky@.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Conky system monitor
+After=display-manager.service local-fs.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/conky -c %h/.config/conky/%i.conf
+Restart=always
+RestartSec=3s
+
+[Install]
+WantedBy=default.target
diff --git a/user/gpg-agent.service b/user/gpg-agent.service
deleted file mode 100644
index 3914f68..0000000
--- a/user/gpg-agent.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=GnuPG private key agent
-IgnoreOnIsolate=true
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/gpg-agent --daemon --homedir=%h/.gnupg
-ExecStop=/usr/bin/pkill gpg-agent
-Restart=on-abort
-
-[Install]
-WantedBy=default.target
diff --git a/user/jack@.service b/user/jack@.service
index 7edafc6..751e5bd 100644
--- a/user/jack@.service
+++ b/user/jack@.service
@@ -5,7 +5,7 @@ After=sound.target local-fs.target
 [Service]
 EnvironmentFile=-/etc/jack/%i
 EnvironmentFile=-%h/.config/jack/%i
-ExecStart=/usr/bin/jackd -n $NAME $REALTIME -p $PORTMAX -d $DRIVER -d $DEVICE $DRIVER_SETTINGS
+ExecStart=/usr/bin/jackd $REALTIME -p $PORTMAX -d $DRIVER -d $DEVICE $DRIVER_SETTINGS
 CPUSchedulingPolicy=rr
 CPUSchedulingPriority=70
 LimitRTPRIO=71