services: Inherit graphical session environment from Shepherd.

This will be utilized by an upcoming home-graphical-session-service-type.

* modules/rosenthal/services/desktop.scm (%home-blueman-applet-shepherd)
(%home-fcitx5-shepherd, %home-mako-shepherd)
(home-network-manager-applet-shepherd, %home-noctalia-shell-shepherd)
(%home-bb-auth-shepherd, %home-polkit-gnome-shepherd, %home-swaybg-shepherd)
(%home-waybar-shepherd): Use environment variables from the running environment.
This commit is contained in:
Hilton Chain 2026-04-09 01:09:25 +08:00
parent f7604b8f00
commit 8967007a20
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292

View File

@ -110,8 +110,12 @@
(documentation "Start blueman applet.") (documentation "Start blueman applet.")
(provision '(blueman-applet)) (provision '(blueman-applet))
(start (start
#~(make-forkexec-constructor #~(lambda args
(list #$(file-append blueman "/bin/blueman-applet")))) ((make-forkexec-constructor
(list #$(file-append blueman "/bin/blueman-applet"))
;; Inherit graphical session environment.
#:environment-variables (environ))
args)))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define home-blueman-applet-service-type (define home-blueman-applet-service-type
@ -225,8 +229,12 @@
(provision '(fcitx5)) (provision '(fcitx5))
(requirement '(dbus)) (requirement '(dbus))
(start (start
#~(make-forkexec-constructor #~(lambda args
(list #$(file-append fcitx5 "/bin/fcitx5")))) ((make-forkexec-constructor
(list #$(file-append fcitx5 "/bin/fcitx5"))
;; Inherit graphical session environment.
#:environment-variables (environ))
args)))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define home-fcitx5-service-type (define home-fcitx5-service-type
@ -276,8 +284,12 @@
(documentation "Start mako.") (documentation "Start mako.")
(provision '(mako)) (provision '(mako))
(start (start
#~(make-forkexec-constructor #~(lambda args
(list #$(file-append mako "/bin/mako")))) ((make-forkexec-constructor
(list #$(file-append mako "/bin/mako"))
;; Inherit graphical session environment.
#:environment-variables (environ))
args)))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define home-mako-service-type (define home-mako-service-type
@ -308,8 +320,12 @@
(documentation "Start network manager applet.") (documentation "Start network manager applet.")
(provision '(network-manager-applet)) (provision '(network-manager-applet))
(start (start
#~(make-forkexec-constructor #~(lambda args
(list #$(file-append network-manager-applet "/bin/nm-applet")))) ((make-forkexec-constructor
(list #$(file-append network-manager-applet "/bin/nm-applet"))
;; Inherit graphical session environment.
#:environment-variables (environ))
args)))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define home-network-manager-applet-service-type (define home-network-manager-applet-service-type
@ -380,9 +396,13 @@ compositor.")))
(provision '(noctalia-shell)) (provision '(noctalia-shell))
(modules '((shepherd support))) (modules '((shepherd support)))
(start (start
#~(make-forkexec-constructor #~(lambda args
((make-forkexec-constructor
(list #$(file-append noctalia-shell "/bin/noctalia-shell")) (list #$(file-append noctalia-shell "/bin/noctalia-shell"))
#:log-file (in-vicinity %user-log-dir "noctalia-shell.log"))) #:log-file (in-vicinity %user-log-dir "noctalia-shell.log")
;; Inherit graphical session environment.
#:environment-variables (environ))
args)))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define home-noctalia-shell-service-type (define home-noctalia-shell-service-type
@ -407,8 +427,12 @@ compositor.")))
(list (shepherd-service (list (shepherd-service
(provision '(bb-auth)) (provision '(bb-auth))
(start (start
#~(make-forkexec-constructor #~(lambda args
(list #$(file-append bb-auth "/libexec/bb-auth") "--daemon"))) ((make-forkexec-constructor
(list #$(file-append bb-auth "/libexec/bb-auth") "--daemon")
;; Inherit graphical session environment.
#:environment-variables (environ))
args)))
(stop #~(make-kill-destructor))))) (stop #~(make-kill-destructor)))))
(define home-bb-auth-service-type (define home-bb-auth-service-type
@ -429,8 +453,12 @@ compositor.")))
(list (shepherd-service (list (shepherd-service
(provision '(polkit-gnome)) (provision '(polkit-gnome))
(start (start
#~(make-forkexec-constructor #~(lambda args
(list #$(file-append polkit-gnome "/libexec/polkit-gnome-authentication-agent-1")))) ((make-forkexec-constructor
(list #$(file-append polkit-gnome "/libexec/polkit-gnome-authentication-agent-1"))
;; Inherit graphical session environment.
#:environment-variables (environ))
args)))
(stop #~(make-kill-destructor))))) (stop #~(make-kill-destructor)))))
(define home-polkit-gnome-service-type (define home-polkit-gnome-service-type
@ -489,9 +517,13 @@ compositor.")))
(documentation "Start swaybg.") (documentation "Start swaybg.")
(provision '(swaybg)) (provision '(swaybg))
(start (start
#~(make-forkexec-constructor #~(lambda args
((make-forkexec-constructor
(list #$(file-append swaybg "/bin/swaybg") "--mode" "fill" (list #$(file-append swaybg "/bin/swaybg") "--mode" "fill"
"--image" #$background))) "--image" #$background)
;; Inherit graphical session environment.
#:environment-variables (environ))
args)))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define home-swaybg-service-type (define home-swaybg-service-type
@ -620,8 +652,12 @@ compositor.")))
(documentation "Start waybar.") (documentation "Start waybar.")
(provision '(waybar)) (provision '(waybar))
(start (start
#~(make-forkexec-constructor #~(lambda args
(list #$(file-append waybar "/bin/waybar")))) ((make-forkexec-constructor
(list #$(file-append waybar "/bin/waybar"))
;; Inherit graphical session environment.
#:environment-variables (environ))
args)))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))))))
(define home-waybar-service-type (define home-waybar-service-type