From af58bddb5760c76d54bca13028409f3722c13d8a Mon Sep 17 00:00:00 2001 From: Rutherther Date: Sat, 24 Aug 2024 14:44:04 +0200 Subject: [PATCH] fix: make sure wayland display services bring wayland-display to home services --- home/modules/ruther/home/services/kanshi.scm | 4 +++- home/modules/ruther/home/services/wayland.scm | 24 ++++++++++++++----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/home/modules/ruther/home/services/kanshi.scm b/home/modules/ruther/home/services/kanshi.scm index 40dae2e..b24bb10 100644 --- a/home/modules/ruther/home/services/kanshi.scm +++ b/home/modules/ruther/home/services/kanshi.scm @@ -133,4 +133,6 @@ (description "A service for configuring and running kanshi through Shepherd") (extensions (list (service-extension home-shepherd-service-type - home-kanshi-shepherd-services))))) + home-kanshi-shepherd-services) + (service-extension home-wayland-display-service-type + (const #f)))))) diff --git a/home/modules/ruther/home/services/wayland.scm b/home/modules/ruther/home/services/wayland.scm index 4a15132..4b0ff54 100644 --- a/home/modules/ruther/home/services/wayland.scm +++ b/home/modules/ruther/home/services/wayland.scm @@ -89,7 +89,9 @@ This should be called from a wayland compositor like this: `herd start wayland-d (default-value '()) (extensions (list (service-extension home-shepherd-service-type - wlr-services-shepherd-service))))) + wlr-services-shepherd-service) + (service-extension home-wayland-display-service-type + (const #f)))))) (define-configuration/no-serialization home-emacs-configuration (emacs (file-like emacs) "Emacs package to use.") @@ -116,7 +118,9 @@ This should be called from a wayland compositor like this: `herd start wayland-d (default-value (home-emacs-configuration)) (extensions (list (service-extension home-shepherd-service-type - home-emacs-shepherd-service))))) + home-emacs-shepherd-service) + (service-extension home-wayland-display-service-type + (const #f)))))) (define-configuration/no-serialization home-network-manager-applet-configuration (network-manager-applet (file-like network-manager-applet) "Network manager applet package to use.") @@ -142,7 +146,9 @@ This should be called from a wayland compositor like this: `herd start wayland-d (default-value (home-network-manager-applet-configuration)) (extensions (list (service-extension home-shepherd-service-type - home-network-manager-applet-shepherd-service))))) + home-network-manager-applet-shepherd-service) + (service-extension home-wayland-display-service-type + (const #f)))))) (define-configuration/no-serialization home-blueman-applet-configuration (blueman (file-like blueman) "Blueman package to use, with blueman-applet binary.") @@ -168,7 +174,9 @@ This should be called from a wayland compositor like this: `herd start wayland-d (default-value (home-blueman-applet-configuration)) (extensions (list (service-extension home-shepherd-service-type - home-blueman-applet-shepherd-service))))) + home-blueman-applet-shepherd-service) + (service-extension home-wayland-display-service-type + (const #f)))))) (define-configuration/no-serialization home-waybar-configuration (waybar (file-like waybar) "Waybar package to use, with waybar binary.") @@ -194,7 +202,9 @@ This should be called from a wayland compositor like this: `herd start wayland-d (default-value (home-waybar-configuration)) (extensions (list (service-extension home-shepherd-service-type - home-waybar-shepherd-service))))) + home-waybar-shepherd-service) + (service-extension home-wayland-display-service-type + (const #f)))))) ;; TODO configuration (define-configuration/no-serialization home-gammastep-configuration @@ -221,4 +231,6 @@ This should be called from a wayland compositor like this: `herd start wayland-d (default-value (home-gammastep-configuration)) (extensions (list (service-extension home-shepherd-service-type - home-gammastep-shepherd-service))))) + home-gammastep-shepherd-service) + (service-extension home-wayland-display-service-type + (const #f)))))) -- 2.48.1