From bad01d35e210eb0e27c53bb7d89fff22e46d6952 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Sun, 18 Aug 2024 18:39:24 +0200
Subject: Fix i3lock invocation

---
 tw/services/desktop.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tw/services/desktop.scm b/tw/services/desktop.scm
index ec6b79e6..819d5fdd 100644
--- a/tw/services/desktop.scm
+++ b/tw/services/desktop.scm
@@ -45,7 +45,7 @@
   #:use-module ((gnu packages version-control) #:select (git))
   #:use-module ((gnu packages video) #:select (mpv obs obs-pipewire-audio-capture))
   #:use-module ((gnu packages web-browsers) #:select (lynx))
-  #:use-module ((gnu packages wm) #:select (dunst polybar swaybg swayfx swayidle swaylock waybar))
+  #:use-module ((gnu packages wm) #:select (i3lock dunst polybar swaybg swayfx swayidle swaylock waybar))
   #:use-module ((gnu packages xdisorg) #:select (arandr numlockx hsetroot rofi rofi-calc rofi-wayland wl-clipboard wob xclip xdotool xsel))
   #:use-module ((gnu packages xfce) #:select (xfce4-screenshooter))
   #:use-module ((gnu packages xorg) #:select (xdpyinfo xev xfd xfontsel xinput xkill xprop xrandr xset xrdb xwininfo setxkbmap))
@@ -276,9 +276,9 @@ show_border=1
         #~(begin ; Wrapper around i3lock to turn off the screen and pause notifications.
             (system* #$(file-append dunst "/bin/dunstctl") "set-paused" "true")
             (system* #$(file-append xset "/bin/xset") "dpms" "0" "0" "5")
-            ;; We mustn't use `file-append' here, as we have to pick up the
-            ;; setuid binary for i3lock installed by the system config.
-            (system* "i3lock" "-nc" #$catppuccin-background-color)
+            ;; i3lock needs to have a `pam-root-service-type' entry or be
+            ;; installed as a setuid binary for this to work.
+            (system* #$(file-append i3lock "/bin/i3lock") "-nc" #$catppuccin-background-color)
             (system* #$(file-append xset "/bin/xset") "dpms" "600" "600" "600")
             (system* #$(file-append dunst "/bin/dunstctl") "set-paused" "false"))))
     ,@common-home-files))
-- 
cgit v1.2.3