integrate hypridle shepherd service

1 files changed, 23 insertions, 17 deletions

diff --git a/sigils/home/services/hyprland.scm b/sigils/home/services/hyprland.scm
index 4b662e9..9ffc0da 100644
--- a/sigils/home/services/hyprland.scm
+++ b/sigils/home/services/hyprland.scm
@@ -348,6 +348,7 @@ configuration, you can use a @code{source} keyword.
   (let ((hyprpaper (home-hyprpaper-configuration-hyprpaper config)))
     (list (shepherd-service
            (provision '(hyprpaper))
+           (requirement '(wayland-display))
            (modules '((srfi srfi-1)
                       (srfi srfi-26)))
            (start #~(lambda _
@@ -430,19 +431,25 @@ configuration, you can use a @code{source} keyword.
              (serialize-hypr-config
               (home-hypridle-configuration-config config))))))
 
-(define (home-hypridle-shepherd-service config)
-  (shepherd-service
-   (documentation "Hypridle daemon")
-   (provision '(hypridle))
-   (requirement '(dbus))
-   (start #~(make-forkexec-constructor
-             (list #$(file-append
-                      (home-hypridle-configuration-hypridle config)
-                      "/bin/hypridle"))
-             #:log-file (string-append
-                         (getenv "XDG_STATE_HOME") "/log"
-                         "/hyprpidle.log")))
-   (stop #~(make-kill-destructor))))
+(define (hypridle-shepherd-service config)
+  (let ((hypridle (home-hypridle-configuration-hypridle config)))
+    (list (shepherd-service
+           (provision '(hypridle))
+           (requirement '(wayland-display))
+           (modules '((srfi srfi-1)
+                      (srfi srfi-26)))
+           (start #~(lambda _
+                      (fork+exec-command
+                       (list #$(file-append hypridle "/bin/hypridle"))
+                       #:log-file (string-append
+                                   (getenv "XDG_STATE_HOME") "/log"
+                                   "/hypridle.log")
+                       #:environment-variables
+                       (cons (string-append "WAYLAND_DISPLAY=" (getenv "WAYLAND_DISPLAY"))
+                             (remove (cut string-prefix? "WAYLAND_DISPLAY=" <>)
+                                     (default-environment-variables))))))
+           (stop #~(make-kill-destructor))
+           (documentation "Start hypridle")))))
 
 (define home-hypridle-service-type
   (service-type
@@ -451,10 +458,9 @@ configuration, you can use a @code{source} keyword.
     (list (service-extension
            home-xdg-configuration-files-service-type
            hypridle-configuration->file)
-          ;; (service-extension
-          ;;  home-shepherd-service-type
-          ;;  (lambda (config)
-          ;;    (list (home-hypridle-shepherd-service config))))
+          (service-extension
+           home-shepherd-service-type
+           hypridle-shepherd-service)
           (service-extension
            home-profile-service-type
            (lambda (config)