From b1b500667dde14a86c48a7b77ced9e015ceb5849 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Sat, 25 Feb 2023 14:54:23 +0100
Subject: [PATCH] change lockscreen-auto unit

---
 defaults/main.yaml                              |  2 +-
 tasks/clean.yaml                                |  5 +++++
 tasks/lockscreen.yaml                           | 14 +++++++-------
 templates/lockscreen/lockscreen-auto.service.j2 | 13 -------------
 templates/lockscreen/xss-lock.service.j2        | 15 +++++++++++++++
 5 files changed, 28 insertions(+), 21 deletions(-)
 delete mode 100644 templates/lockscreen/lockscreen-auto.service.j2
 create mode 100644 templates/lockscreen/xss-lock.service.j2

diff --git a/defaults/main.yaml b/defaults/main.yaml
index 349a868..5fdcd58 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -38,7 +38,7 @@ system_suspend_command: systemctl suspend
 system_reboot_command: systemctl reboot
 system_poweroff_command: systemctl poweroff
 
-lockscreen_auto_enabled: true
+xss_lock_enabled: true
 lockscreen_lock_command: xset s activate
 lockscreen_timeout: 300
 lockscreen_locktime: 30
diff --git a/tasks/clean.yaml b/tasks/clean.yaml
index efccbb4..53fc2e2 100644
--- a/tasks/clean.yaml
+++ b/tasks/clean.yaml
@@ -13,3 +13,8 @@
     - pipe-watcher
     - select-screenlayout
     - timer
+
+- name: remove lockscreen-auto systemd user service
+  file:
+    path: ~/.config/systemd/user/lockscreen-auto.service
+    state: absent
diff --git a/tasks/lockscreen.yaml b/tasks/lockscreen.yaml
index c7346dc..2794dc2 100644
--- a/tasks/lockscreen.yaml
+++ b/tasks/lockscreen.yaml
@@ -19,13 +19,13 @@
 
 - name: lockscreen-auto graphical-session service definition
   template:
-    src: lockscreen/lockscreen-auto.service.j2
-    dest: ~/.config/systemd/user/lockscreen-auto.service
+    src: lockscreen/xss-lock.service.j2
+    dest: ~/.config/systemd/user/xss-lock.service
   notify: systemd daemon-reload
 
-- name: lockscreen-auto graphical-session service
+- name: xss-lock graphical-session service
   systemd:
-    name: lockscreen-auto.service
-    enabled: "{{ lockscreen_auto_enabled }}"
-    state: "{{ lockscreen_auto_enabled | ternary('started','stopped') }}"
-    scope: user
+    name: xss-lock.service
+    enabled: "{{ xss_lock_enabled }}"
+    state: "{{ xss_lock_enabled | ternary('started','stopped') }}"
+    scope: user
\ No newline at end of file
diff --git a/templates/lockscreen/lockscreen-auto.service.j2 b/templates/lockscreen/lockscreen-auto.service.j2
deleted file mode 100644
index aded42e..0000000
--- a/templates/lockscreen/lockscreen-auto.service.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ ansible_managed | comment }}
-
-[Unit]
-Description=Screensaver
-PartOf=graphical-session.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/xss-lock -l -- systemctl --user start lockscreen.service
-Restart=always
-
-[Install]
-WantedBy=graphical-session.target
diff --git a/templates/lockscreen/xss-lock.service.j2 b/templates/lockscreen/xss-lock.service.j2
new file mode 100644
index 0000000..c630ccb
--- /dev/null
+++ b/templates/lockscreen/xss-lock.service.j2
@@ -0,0 +1,15 @@
+[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
+
+[Install]
+WantedBy=graphical-session.target