fix lockscreen-auto

templates/lockscreen/xss-lock.service.j2

@@ -1,15 +1,14 @@
+{{ ansible_managed | comment }}
+
 [Unit]
 Description=xss-lock - use external locker as X screen saver
 Documentation=man:xss-lock(1)
 PartOf=graphical-session.target
-Wants=xset.service
-After=xset.service
 
 [Service]
 Type=simple
-EnvironmentFile=/home/anarcat/.xsecurelock.env
-# note that when this works, document in #994762
-ExecStart=/usr/bin/xss-lock --verbose --transfer-sleep-lock --session=${XDG_SESSION_ID} --notifier /usr/libexec/xsecurelock/dimmer -- xsecurelock
+Restart=always
+ExecStart=/usr/bin/xss-lock --verbose --transfer-sleep-lock --session=${XDG_SESSION_ID} -- systemctl --user start lockscreen.service
 
 [Install]
 WantedBy=graphical-session.target

templates/x11/xsession.j2

@@ -7,6 +7,7 @@ systemctl --user --wait start pathappend.service
 {% if not home_xsession_vncviewer %}
 set -x XDG_SESSION_TYPE x11
 systemctl --user import-environment XDG_SESSION_TYPE
+systemctl --user import-environment XDG_SESSION_ID
 exec systemctl --user start --wait xsession.target
 {% else %}
 systemctl --user start vncserver@:{{home_vncserver_display_number}}.service