From bb25a3927805cbfa492f2698c60e508183124e18 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Fri, 1 Mar 2024 00:12:25 +0100
Subject: Activate home-dbus service only in graphical environments

It's annoying on servers, because logging in via SSH spawns a new Shepherd +
dbus instance each time.
---
 tw/home.scm      | 7 +------
 tw/home/btl.scm  | 2 ++
 tw/home/cern.scm | 2 ++
 tw/home/frm.scm  | 2 ++
 tw/home/lap.scm  | 2 ++
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tw/home.scm b/tw/home.scm
index 9eca91b9..efa21344 100644
--- a/tw/home.scm
+++ b/tw/home.scm
@@ -636,12 +636,7 @@ show_border=1
           (service-extension home-files-service-type non-xdg-configs)
           (service-extension home-environment-variables-service-type environment-variables)
           (service-extension home-mcron-service-type cron-jobs)
-          (service-extension home-shepherd-service-type shepherd-services)
-          ;; The dbus service doesn't seem to be added automatically.
-          ;; Always activate it, even in non-graphical environments, because the
-          ;; `service-extension' itself can't depend on the `tw-home-configuration'.
-          ;; It shouldn't be too much overhead, though.
-          (service-extension home-dbus-service-type (const #t))))))
+          (service-extension home-shepherd-service-type shepherd-services)))))
 
 
 ;;; Restic backup helpers
diff --git a/tw/home/btl.scm b/tw/home/btl.scm
index 3d36e78f..bc08ff82 100644
--- a/tw/home/btl.scm
+++ b/tw/home/btl.scm
@@ -47,6 +47,8 @@
         (nighttime-brightness 0.7)
         (extra-content "fade=0")))  ; with fade=1, restarting redshift causes flickering for a few secs
 
+     (service home-dbus-service-type)
+
      (service home-blueman-service-type)
 
      (service home-desktop-layout-service-type
diff --git a/tw/home/cern.scm b/tw/home/cern.scm
index a7643ee4..957353d9 100644
--- a/tw/home/cern.scm
+++ b/tw/home/cern.scm
@@ -62,6 +62,8 @@
         (nighttime-brightness 0.7)
         (extra-content "fade=0")))  ; with fade=1, restarting redshift causes flickering for a few secs
 
+     (service home-dbus-service-type)
+
      (service home-desktop-layout-service-type
        (home-desktop-layout-configuration
         (desktop-background "~/.config/X11/ridge-view.jpg")
diff --git a/tw/home/frm.scm b/tw/home/frm.scm
index 8131ea90..3d720a2f 100644
--- a/tw/home/frm.scm
+++ b/tw/home/frm.scm
@@ -50,6 +50,8 @@
         (nighttime-brightness 0.7)
         (extra-content "fade=0")))  ; with fade=1, restarting redshift causes flickering for a few secs
 
+     (service home-dbus-service-type)
+
      (service home-blueman-service-type)
 
      (service home-desktop-layout-service-type
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index 34e44396..958a5647 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -95,6 +95,8 @@
         (nighttime-brightness 0.7)
         (extra-content "fade=0")))  ; with fade=1, restarting redshift causes flickering for a few secs
 
+     (service home-dbus-service-type)
+
      (service home-blueman-service-type)
 
      (service home-desktop-layout-service-type
-- 
cgit v1.2.3