From e3e2fcdbd9b1afca78cd641078612572aa53225b Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Fri, 10 Nov 2023 18:56:38 +0100
Subject: Make graphical services depend on new x11-display service

This should avoid spam from failing services when logging in on a TTY.
---
 tw/home.scm      | 6 ++++++
 tw/home/cern.scm | 5 -----
 tw/home/lap.scm  | 5 -----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/tw/home.scm b/tw/home.scm
index eac7d94b..ebccfce9 100644
--- a/tw/home.scm
+++ b/tw/home.scm
@@ -416,6 +416,7 @@ show_border=1
       (shepherd-service
        (documentation "Emacs server; connect using emacsclient.")
        (provision '(emacs))
+       (requirement '(x11-display))
        (start #~(make-forkexec-constructor
                  (list #$(file-append emacs "/bin/emacs") "--fg-daemon")))
        (stop #~(make-kill-destructor)))))
@@ -428,6 +429,7 @@ show_border=1
       (shepherd-service
        (documentation "NetworkManager applet; provides a GUI for network connections.")
        (provision '(nm-applet))
+       (requirement '(x11-display))
        (start #~(make-forkexec-constructor
                  (list #$(file-append network-manager-applet "/bin/nm-applet"))))
        (stop #~(make-kill-destructor)))
@@ -435,6 +437,7 @@ show_border=1
       (shepherd-service
        (documentation "Dunst notification daemon; displays desktop notifications.")
        (provision '(dunst))
+       (requirement '(x11-display))
        (start #~(make-forkexec-constructor
                  (list #$(file-append dunst "/bin/dunst"))))
        (stop #~(make-kill-destructor)))
@@ -449,6 +452,7 @@ show_border=1
         (shepherd-service
          (documentation "Picom compositor; enables transparent windows in X.")
          (provision '(picom))
+         (requirement '(x11-display))
          (start #~(make-forkexec-constructor
                    (list #$(file-append (grafter picom) "/bin/picom")
                          "--config" #$(local-file "home/files/picom.conf"))))
@@ -457,6 +461,7 @@ show_border=1
       (shepherd-service
        (documentation "Source Xresources on login.")
        (provision '(xrdb))
+       (requirement '(x11-display))
        (one-shot? #t)
        (start #~(lambda _
                   (invoke #$(file-append xrdb "/bin/xrdb") "-merge"
@@ -467,6 +472,7 @@ show_border=1
       (shepherd-service
        (documentation "Fix X keyboard map on login; passmenu needs this.")
        (provision '(fix-xdotool))
+       (requirement '(x11-display))
        (one-shot? #t)
        (start #~(lambda _
                   (use-modules (ice-9 rdelim)
diff --git a/tw/home/cern.scm b/tw/home/cern.scm
index 870e6ea0..e6ceffb0 100644
--- a/tw/home/cern.scm
+++ b/tw/home/cern.scm
@@ -4,9 +4,6 @@
 ;; need to capture the channels being used, as returned by "guix describe".
 ;; See the "Replicating Guix" section in the manual.
 
-;; See also, for some tips:
-;; https://github.com/alezost/shepherd-config/blob/master/init.scm
-
 (define-module (tw home cern)
   #:use-module ((gnu)
                 #:select (use-package-modules))
@@ -16,10 +13,8 @@
   #:use-module (gnu home services guix)
   #:use-module (gnu home services mcron)
   #:use-module (gnu home services pm)
-  #:use-module (gnu home services shepherd)
   #:use-module (gnu packages)
   #:use-module (gnu services)
-  #:use-module (gnu services shepherd)
   #:use-module (guix channels)
   #:use-module (guix gexp)
   #:use-module ((nongnu packages messaging)
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index 00a59cab..1b8e2908 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -4,9 +4,6 @@
 ;; need to capture the channels being used, as returned by "guix describe".
 ;; See the "Replicating Guix" section in the manual.
 
-;; See also, for some tips:
-;; https://github.com/alezost/shepherd-config/blob/master/init.scm
-
 (define-module (tw home lap)
   #:use-module (gnu home)
   #:use-module (gnu home services)
@@ -15,7 +12,6 @@
   #:use-module (gnu home services mail)
   #:use-module (gnu home services mcron)
   #:use-module (gnu home services pm)
-  #:use-module (gnu home services shepherd)
   #:use-module (gnu packages android)
   #:use-module (gnu packages bittorrent)
   #:use-module (gnu packages calendar)
@@ -31,7 +27,6 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu services)
-  #:use-module (gnu services shepherd)
   #:use-module (guix gexp)
   #:use-module ((nongnu packages messaging)
                 #:select (signal-desktop))
-- 
cgit v1.2.3