diff --git a/modules/rosenthal/services/child-error.scm b/modules/rosenthal/services/child-error.scm index 18d088a..efb825d 100644 --- a/modules/rosenthal/services/child-error.scm +++ b/modules/rosenthal/services/child-error.scm @@ -5,8 +5,8 @@ ;; Utilities #:use-module (guix gexp) #:use-module (guix records) + #:use-module (rosenthal utils file) #:use-module (rosenthal utils predicates) - #:use-module (rosenthal utils serializers yaml) ;; Guix System #:use-module (gnu system shadow) ;; Guix System - services @@ -274,16 +274,14 @@ headers. This can expose sensitive information in your logs.") (file-like wakapi-bin) "The wakapi package.") (config - (yaml-config '()) + gexp "Association list of Wakapi configurations.") (no-serialization)) (define home-wakapi-shepherd-service (match-record-lambda (wakapi config) - (let ((config-file (mixed-text-file - "wakapi.yaml" - #~(string-append #$@(yaml-serialize config) "\n")))) + (let ((config-file (yaml-file "wakapi.yaml" config))) (list (shepherd-service (documentation "Run wakapi.") (provision '(wakapi)) diff --git a/modules/rosenthal/services/mail.scm b/modules/rosenthal/services/mail.scm index 28fa3f0..4805769 100644 --- a/modules/rosenthal/services/mail.scm +++ b/modules/rosenthal/services/mail.scm @@ -7,7 +7,7 @@ ;; Utilities #:use-module (guix gexp) #:use-module (guix records) - #:use-module (rosenthal utils serializers yaml) + #:use-module (rosenthal utils file) ;; Guix System - services #:use-module (gnu services) #:use-module (gnu services admin) @@ -91,7 +91,7 @@ (file-like goimapnotify) "") (config - yaml-config + gexp "") (wait (integer 1) @@ -109,8 +109,7 @@ (define home-goimapnotify-shepherd (match-record-lambda (goimapnotify config wait shepherd-provision shepherd-requirement auto-start?) - (let ((config-file - (mixed-text-file "goimapnotify.yaml" (yaml-serialize config)))) + (let ((config-file (yaml-file "goimapnotify.yaml" config))) (list (shepherd-service (provision shepherd-provision) (requirement shepherd-requirement) diff --git a/modules/rosenthal/services/monitoring.scm b/modules/rosenthal/services/monitoring.scm index 6381185..281289a 100644 --- a/modules/rosenthal/services/monitoring.scm +++ b/modules/rosenthal/services/monitoring.scm @@ -8,7 +8,6 @@ #:use-module (guix records) #:use-module (rosenthal utils file) #:use-module (rosenthal utils predicates) - #:use-module (rosenthal utils serializers yaml) ;; Guix System #:use-module (gnu system shadow) ;; Guix System - services diff --git a/modules/rosenthal/services/web.scm b/modules/rosenthal/services/web.scm index d9f7e0e..e239a15 100644 --- a/modules/rosenthal/services/web.scm +++ b/modules/rosenthal/services/web.scm @@ -8,7 +8,6 @@ #:use-module (guix records) #:use-module (rosenthal utils file) #:use-module (rosenthal utils predicates) - #:use-module (rosenthal utils serializers yaml) ;; Guix System #:use-module (gnu system privilege) #:use-module (gnu system shadow)