Merge branch 'master' of sleepmap.de:software/uenv0.8.3

* 'master' of sleepmap.de:software/uenv:
  README.rst: Removing gpg-agent.service specific information.
  user/gpg-agent.service: Removing gpg-agent.service, as it was added to the repository package gnupg.
  user/jack@.service: Leaving space between flags and parameters.
  user/conky@.service: Moving to .conf files for conky configuration.
  user/jack@.service: Removing named server settings (they conflict with many default clients.
  NEWS: Adding information for version 0.7.0.
  README.rst: Removing update-mirrorlist system services (project seems dead and there is now update-pacman-mirrorlist: https://aur.archlinux.org/packages/update-pacman-mirrorlist/).
  README.rst: Adding information regarding the conky@ user service.
  user/conky@.service: Adding a conky@ user service, that can be used to start conky scripts by configuration file name.
  user/compton.service: Adding a check if X is running using xset. Raising RestartSec to 3s. Making service anti-dependant on realtime kernel.

10 files changed, 44 insertions, 70 deletions

diff --git a/NEWS b/NEWS
index e6486cb..d610b20 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 uenv
 
+CHANGES WITH 0.7.0
+    * Removing update-mirrorlist functionality (project seems dead and
+      update-pacman-mirrorlist seems to be its successor)
+    * Fixing compton user service to start properly when not on realtime kernel
+    * Adding configuration based conky user service to start multiple conky
+      instances alongside the session
+
 CHANGES WITH 0.6.0
     * Making real-time kernel settings depend on /sys/kernel/realtime instead
       of kernel command line parameters.
diff --git a/README.rst b/README.rst
index 1aba7bf..dc9d656 100644
--- a/README.rst
+++ b/README.rst
@@ -56,6 +56,22 @@ ______________
      systemctl --user start compton
      systemctl --user enable compton
 
+conky@ --user
+______________
+| The |conky| user service needs a properly exported *$DISPLAY* variable to work. You can set this in your |systemd-user.conf|:
+
+  .. code:: ini
+
+    DefaultEnvironment=DISPLAY=:0
+
+| The |conky| user service starts conky scripts by name. This means, the word after the *@* directly relates to configuration files in your conky configuration directory (*~/.config/conky/*)
+| You can start and enable it like any other systemd user service, by supplying it with a configuration file name:  
+
+  .. code:: bash
+
+     systemctl --user start conky@my-configuration-name
+     systemctl --user enable conky@my-configuration-name
+
 cpupower-rt
 ___________
 | The cpupower package on |arch_linux| has been |cpupower_feature_request|, to allow easier appliance of CPU settings based on other profiles, than the system's default.
@@ -69,25 +85,6 @@ ___________
     systemctl start cpupower-rt
     systemctl enable cpupower-rt
 
-gpg-agent --user
-________________
-| The systemd user service *gpg-agent.service* starts the gpg-agent and thus makes it independent of a certain session the user runs. The *homedir* for GnuPG is set to be in *~/.gnupg* (default).
-| Therefore make sure to set your *GPG_TTY* and *GPG_AGENT_INFO* |environment_variable| for your |bash| or |zsh| (or whatever you run) to the following
-
-  .. code:: bash
-
-    export GPG_TTY=$(tty)
-    export GPG_AGENT_INFO=""
-
-| **Note**: These settings specifically apply to gnupg > 2.1!
-| Otherwise you can start and enable it like any other systemd user service:  
-
-  .. code:: bash
-
-     systemctl --user start gpg-agent
-     systemctl --user enable gpg-agent
-
-
 irssi --user
 ____________
 | The systemd user service *irssi.service* starts the |irc| client |irssi| in a separate |tmux| environment for the current user.
@@ -218,16 +215,6 @@ ___________
 
     tmux attach
 
-update-mirrorlist
-_________________
-| |update-mirrorlist| is a script to update the system's |pacman| mirrorlist according to some predefined settings. Here it is started on a weekly basis according to a timer unit.
-| To start/enable it, just do:
-
-  .. code:: bash
-
-    systemctl start update-mirrorlist.timer
-    systemctl enable update-mirrorlist.timer
-
 weechat --user
 ______________
 | The systemd user service *weechat.service* starts the |irc| client |weechat| in a separate |tmux| environment for the current user.
@@ -305,6 +292,10 @@ ______________
 
   <a href="https://github.com/chjj/compton/" target="_blank">compton</a>
 
+.. |conky| raw:: html
+
+  <a href="https://github.com/brndnmtthws/conky" target="_blank">conky</a>
+
 .. |real-time_kernel| raw:: html
 
   <a href="https://www.kernel.org/pub/linux/kernel/projects/rt/" target="_blank">real-time kernel</a>
@@ -365,10 +356,6 @@ ______________
 
   <a href="http://www.freedesktop.org/software/systemd/man/loginctl.html" target="_blank">loginctl</a>
 
-.. |update-mirrorlist| raw:: html
-
-  <a href="https://github.com/ushis/update-mirrorlist" target="_blank">update-mirrorlist</a>
-
 .. |pacman| raw:: html
 
   <a href="https://en.wikipedia.org/wiki/Arch_Linux#Pacman" target="_blank">pacman</a>
diff --git a/config/jack/fw1 b/config/jack/fw1
index f597ba6..a851d30 100644
--- a/config/jack/fw1
+++ b/config/jack/fw1
@@ -1,5 +1,4 @@
 # Sample configuration file for a JACK systemd --user service, using a firewire device
-NAME="default"
 DRIVER="firewire"
 DEVICE="/dev/fw1"
 NOMLOCK=""
diff --git a/config/jack/internal-44100 b/config/jack/internal-44100
index 5c27d56..92e9c12 100644
--- a/config/jack/internal-44100
+++ b/config/jack/internal-44100
@@ -1,4 +1,3 @@
-NAME="default"
 DRIVER="alsa"
 DEVICE="hw:PCH"
 NOMLOCK=""
diff --git a/system/update-mirrorlist.service b/system/update-mirrorlist.service
deleted file mode 100644
index 9766df6..0000000
--- a/system/update-mirrorlist.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Update pacman mirrorlist
-After=local-fs.target
-ConditionFileIsExecutable=/usr/bin/update-mirrorlist
-
-[Service]
-Nice=19
-IOSchedulingClass=2
-IOSchedulingPriority=7
-ExecStart=/usr/bin/update-mirrorlist
-
diff --git a/system/update-mirrorlist.timer b/system/update-mirrorlist.timer
deleted file mode 100644
index 72d3688..0000000
--- a/system/update-mirrorlist.timer
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Update pacman mirrorlist every Monday at 05:00
-
-[Timer]
-# Every Monday at 05:00
-OnCalendar=Mon *-*-* 05:00
-Persistent=true
-
-[Install]
-WantedBy=timers.target
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