Separate home service into PIM, dev env and graphical parts

This means we only instantiate Shepherd and mcron services if we really need
them, to avoid annoyance on servers.

1 files changed, 10 insertions, 19 deletions

diff --git a/tw/home/cern.scm b/tw/home/cern.scm
index 957353d9..b7e04ef5 100644
--- a/tw/home/cern.scm
+++ b/tw/home/cern.scm
@@ -22,31 +22,15 @@
   #:use-module (tw gexp)
   #:use-module ((tw packages mail) #:select (mutt_oauth2.py))
   #:use-module (tw services desktop)
+  #:use-module (tw services dev-env)
   #:use-module (tw services git)
   #:use-module (tw services gnupg))
 
 (define-public %cern-home
   (home-environment
-   (packages
-    ;; These packages will show up in the home profile, under ~/.guix-home/profile.
-    (list vdirsyncer khal khard aerc lynx mutt_oauth2.py))   ; lynx for HTML mail
-
    ;; To search for available home services, run 'guix home search KEYWORD'.
    (services
     (list
-     (service tw-home-service-type
-       (tw-home-configuration
-        (pim? #f)))
-
-     ;; Configure PIM services "manually" because we don't want all of them
-     ;; (such as the newsreader) and we need to use different aerc accounts.
-     (simple-service 'pim-config home-xdg-configuration-files-service-type
-       `(("aerc/accounts.conf" ,(local-file "files/aerc/accounts.work.conf"))
-         ("aerc/aerc.conf" ,(local-file "files/aerc/aerc.conf"))
-         ("aerc/binds.conf" ,(local-file "files/aerc/binds.conf"))
-         ("aerc/filters" ,(local-file "files/aerc/filters" #:recursive? #t))
-         ("aerc/stylesets" ,(local-file "files/aerc/stylesets" #:recursive? #t))))
-
      (simple-service 'remote-desktop-config home-files-service-type
        `((".local/share/vinagre/vinagre-bookmarks.xml" ,(local-file "files/vinagre-bookmarks.xml"))))
 
@@ -64,8 +48,10 @@
 
      (service home-dbus-service-type)
 
-     (service home-desktop-layout-service-type
-       (home-desktop-layout-configuration
+     (service tw-home-service-type)
+
+     (service home-desktop-service-type
+       (home-desktop-configuration
         (desktop-background "~/.config/X11/ridge-view.jpg")
         (monitors
          (list (home-monitor-configuration
@@ -77,6 +63,11 @@
                 (xrandr-options '("--mode" "1920x1080" "--rate" "60.00"
                                   "--left-of" "DP-2")))))))
 
+     (service home-full-dev-env-service-type)
+
+     (service home-pim-service-type
+       (home-pim-configuration (work? #t)))
+
      ;; On my work machine, Git must always use my work PGP key.
      (service home-git-service-type
        (home-git-configuration