Install PIM environment on new end-user machines

4 files changed, 49 insertions, 50 deletions

diff --git a/tw/home.scm b/tw/home.scm
index 6f4564a3..4c3ddef8 100644
--- a/tw/home.scm
+++ b/tw/home.scm
@@ -17,6 +17,7 @@
   #:use-module (tw packages catppuccin)
   #:use-module (tw packages ci)
   #:use-module (tw packages games)
+  #:use-module (tw packages mail)
   #:use-module (tw packages xorg)
   #:use-module (tw system)
   #:use-module (tw theme))
@@ -583,3 +584,44 @@ show_border=1
        (".local/bin/volume" ,(local-file "home/files/volume" #:recursive? #t))
        (".local/share/applications/emacsclient.desktop"
         ,(local-file "home/files/emacsclient.desktop"))))))
+
+(define %pim-packages
+  (list newsboat vdirsyncer khal khard aerc lynx mutt_oauth2.py))   ; lynx for HTML mail
+
+(define %pim-services
+  (list
+   (simple-service 'pim-config home-xdg-configuration-files-service-type
+     `(("khal/config" ,(local-file "files/khal.conf"))
+       ("khard/khard.conf" ,(local-file "files/khard.conf"))
+       ("aerc/accounts.conf" ,(local-file "files/aerc/accounts.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))
+       ("newsboat/config" ,(local-file "files/newsboat.conf"))
+       ("newsboat/config.catppuccin" ,catppuccin-newsboat)
+       ("vdirsyncer/config" ,(local-file "files/vdirsyncer.conf"))))
+
+   ;; To avoid popping up a password prompt every time these run, gpg-agent
+   ;; needs a long-enough default-cache-ttl.
+   (simple-service 'pim-cronjobs home-mcron-service-type
+     (list #~(job "15 */4 * * *"   ; every four hours at HH:15
+                  (string-append #$(file-append vdirsyncer "/bin/vdirsyncer") " metasync"))
+           #~(job "0,30 * * * *"   ; every half hour
+                  (string-append #$(file-append vdirsyncer "/bin/vdirsyncer") " sync"))))
+
+   (service home-msmtp-service-type
+     (home-msmtp-configuration
+      (defaults (msmtp-configuration
+                 (tls? #t)
+                 (tls-starttls? #f)   ; use "real" TLS instead
+                 (log-file "-")))     ; log to stdout
+      (accounts (list
+                 (msmtp-account
+                  (name "mythic")
+                  (configuration
+                   (msmtp-configuration
+                    (host "smtp-auth.mythic-beasts.com")
+                    (user "timo@twilken.net")
+                    (password-eval "pass www/mythic-beasts/email/timo | head -1"))))))
+      (default-account "mythic")))))
diff --git a/tw/home/btl.scm b/tw/home/btl.scm
index 9debf38c..22053bfe 100644
--- a/tw/home/btl.scm
+++ b/tw/home/btl.scm
@@ -57,7 +57,7 @@
      ;; home environment faster.
      ;; 0ad flightgear freeciv simutrans/pak128 warzone2100 widelands pioneer
 
-     (append %interactive-packages %common-packages)))
+     (append %interactive-packages %pim-packages %common-packages)))
 
    ;; To search for available home services, run 'guix home search KEYWORD'.
    (services
@@ -107,6 +107,6 @@
         (default-key "53EC3C06856883DD92355BC22FC78504681F69B0")
         (gui-pinentry? #t)))
 
-     (append (interactive-services) %common-services)))))
+     (append (interactive-services) %pim-services %common-services)))))
 
 %btl-home
diff --git a/tw/home/frm.scm b/tw/home/frm.scm
index d8989c74..56358802 100644
--- a/tw/home/frm.scm
+++ b/tw/home/frm.scm
@@ -57,7 +57,7 @@
      ;; home environment faster.
      ;; 0ad flightgear freeciv simutrans/pak128 warzone2100 widelands pioneer
 
-     (append %interactive-packages %common-packages)))
+     (append %interactive-packages %pim-packages %common-packages)))
 
    ;; To search for available home services, run 'guix home search KEYWORD'.
    (services
@@ -114,6 +114,6 @@
         (default-key "53EC3C06856883DD92355BC22FC78504681F69B0")
         (gui-pinentry? #t)))
 
-     (append (interactive-services) %common-services)))))
+     (append (interactive-services) %pim-services %common-services)))))
 
 %frm-home
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index 7f43f77b..b49525ef 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -35,7 +35,6 @@
   #:use-module ((nongnu packages game-client)
                 #:select (steam-nvidia))
   #:use-module (tw home)
-  #:use-module (tw packages mail)
   #:use-module (tw packages scanner)
   #:use-module (tw services desktop)
   #:use-module (tw services git)
@@ -43,47 +42,6 @@
   #:use-module (tw services restic)
   #:use-module (tw theme))
 
-(define pim-packages
-  (list newsboat vdirsyncer khal khard aerc lynx mutt_oauth2.py))   ; lynx for HTML mail
-
-(define pim-services
-  (list
-   (simple-service 'pim-config home-xdg-configuration-files-service-type
-     `(("khal/config" ,(local-file "files/khal.conf"))
-       ("khard/khard.conf" ,(local-file "files/khard.conf"))
-       ("aerc/accounts.conf" ,(local-file "files/aerc/accounts.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))
-       ("newsboat/config" ,(local-file "files/newsboat.conf"))
-       ("newsboat/config.catppuccin" ,catppuccin-newsboat)
-       ("vdirsyncer/config" ,(local-file "files/vdirsyncer.conf"))))
-
-   ;; To avoid popping up a password prompt every time these run, gpg-agent
-   ;; needs a long-enough default-cache-ttl.
-   (simple-service 'pim-cronjobs home-mcron-service-type
-     (list #~(job "15 */4 * * *"   ; every four hours at HH:15
-                  (string-append #$(file-append vdirsyncer "/bin/vdirsyncer") " metasync"))
-           #~(job "0,30 * * * *"   ; every half hour
-                  (string-append #$(file-append vdirsyncer "/bin/vdirsyncer") " sync"))))
-
-   (service home-msmtp-service-type
-     (home-msmtp-configuration
-      (defaults (msmtp-configuration
-                 (tls? #t)
-                 (tls-starttls? #f)   ; use "real" TLS instead
-                 (log-file "-")))     ; log to stdout
-      (accounts (list
-                 (msmtp-account
-                  (name "mythic")
-                  (configuration
-                   (msmtp-configuration
-                    (host "smtp-auth.mythic-beasts.com")
-                    (user "timo@twilken.net")
-                    (password-eval "pass www/mythic-beasts/email/timo | head -1"))))))
-      (default-account "mythic")))))
-
 (define (restic-pass-key key)
   (restic-password-source (type 'pass) (name key)))
 
@@ -113,7 +71,7 @@
      ;; home environment faster.
      ;; 0ad flightgear freeciv simutrans/pak128 warzone2100 widelands pioneer
 
-     (append %interactive-packages pim-packages %common-packages)))
+     (append %interactive-packages %pim-packages %common-packages)))
 
    ;; To search for available home services, run 'guix home search KEYWORD'.
    (services
@@ -212,8 +170,7 @@
         (default-key "53EC3C06856883DD92355BC22FC78504681F69B0")
         (gui-pinentry? #t)))
 
-     (append pim-services
-             (interactive-services #:nvidia-driver? #t)
-             %common-services)))))
+     (append (interactive-services #:nvidia-driver? #t)
+             %pim-services %common-services)))))
 
 %lap-home