Segregate xorg services

2 files changed, 42 insertions, 41 deletions

diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index c512ab6..c84a8de 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -21,7 +21,8 @@
             bd-base-system-services
             bd-base-home-services))
 
-(use-service-modules base file-sharing
+(use-service-modules admin avahi base
+                     dbus desktop file-sharing
                      networking ssh)
 
 (use-package-modules
@@ -104,13 +105,47 @@
    ))
 
 (define bd-base-system-services
-  `(,(service openssh-service-type
+  `(
+    ;; so that non-root users in the wheel group can
+    ;; perform administrative tasks (similar to "sudo").
+    ,polkit-wheel-service
+    ;; The global fontconfig cache directory can sometimes contain
+    ;; stale entries, possibly referencing fonts that have been GC'd,
+    ;; so mount it read-only.
+    ,fontconfig-file-system-service
+
+    ,(service network-manager-service-type)
+    ,(service wpa-supplicant-service-type) ; needed by NetworkManager
+    ,(service modem-manager-service-type)
+    ,(service usb-modeswitch-service-type)
+
+    ;; The D-Bus clique.
+    ,(service avahi-service-type)
+    ,(service udisks-service-type)
+    ,(service upower-service-type)
+    ,(service accountsservice-service-type)
+    ,(service cups-pk-helper-service-type)
+    ,(service colord-service-type)
+    ,(service geoclue-service-type)
+    ,(service polkit-service-type)
+    ,(service elogind-service-type
+              (elogind-configuration
+               (handle-power-key 'hibernate)
+               ;;  (idle-action-seconds (* 5 60))
+               ;;  (idle-action 'suspend)
+               ))
+    ,(service dbus-root-service-type)
+
+    ,(service ntp-service-type)
+
+    ,(service openssh-service-type
               (openssh-configuration
                (x11-forwarding? #t)
                (permit-root-login 'prohibit-password)
                (password-authentication? #f)))
     ,(service tor-service-type)
     ,(service transmission-daemon-service-type)
+
     ,@%base-services))
 
 (define bd-base-home-services
@@ -124,7 +159,6 @@
             (home-gpg-agent-configuration
              (pinentry-program
               (file-append pinentry "/bin/pinentry"))
-             (max-cache-ttl 43200)
              (ssh-support? #t)))
 
    (service home-bash-service-type
diff --git a/.config/guix/modules/xorg.scm b/.config/guix/modules/xorg.scm
index dd3f994..9a94f8b 100644
--- a/.config/guix/modules/xorg.scm
+++ b/.config/guix/modules/xorg.scm
@@ -1,7 +1,7 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Provides a set of my preferred    ;;
-;; program and services for desktops ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Provides a set of my preferred      ;;
+;; program and services for x desktops ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
 (define-module (modules xorg)
@@ -15,8 +15,7 @@
             bd-desktop-system-services
             bd-desktop-home-services))
 
-(use-service-modules admin audio avahi dbus
-                     desktop networking
+(use-service-modules audio desktop networking
                      sound xorg)
 
 (use-package-modules
@@ -67,38 +66,6 @@
              (name "slock")
              (program (file-append slock "/bin/slock"))))
 
-   ;; so that non-root users in the wheel group can
-   ;; perform administrative tasks (similar to "sudo").
-   polkit-wheel-service
-   ;; The global fontconfig cache directory can sometimes contain
-   ;; stale entries, possibly referencing fonts that have been GC'd,
-   ;; so mount it read-only.
-   fontconfig-file-system-service
-
-   (service network-manager-service-type)
-   (service wpa-supplicant-service-type) ; needed by NetworkManager
-   (service modem-manager-service-type)
-   (service usb-modeswitch-service-type)
-
-   ;; The D-Bus clique.
-   (service avahi-service-type)
-   (service udisks-service-type)
-   (service upower-service-type)
-   (service accountsservice-service-type)
-   (service cups-pk-helper-service-type)
-   (service colord-service-type)
-   (service geoclue-service-type)
-   (service polkit-service-type)
-   (service elogind-service-type
-            (elogind-configuration
-             (handle-power-key 'hibernate)
-             ;;  (idle-action-seconds (* 5 60))
-             ;;  (idle-action 'suspend)
-             ))
-   (service dbus-root-service-type)
-
-   (service ntp-service-type)
-
    (service x11-socket-directory-service-type)
 
    (service pulseaudio-service-type)