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.

1 files changed, 20 insertions, 33 deletions

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>