From d44b9efda2d387430e63c1d6cd426c88bcde2eda Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Tue, 12 Sep 2023 19:42:21 +0200
Subject: Factor out proper Git and GnuPG service types

---
 tw/home/cern.scm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'tw/home/cern.scm')

diff --git a/tw/home/cern.scm b/tw/home/cern.scm
index f0dc7214..8c6ed7d5 100644
--- a/tw/home/cern.scm
+++ b/tw/home/cern.scm
@@ -30,6 +30,8 @@
   #:use-module (tw packages catppuccin)
   #:use-module (tw packages xorg)
   #:use-module (tw gexp)
+  #:use-module (tw services git)
+  #:use-module (tw services gnupg)
   #:use-module (tw theme))
 
 (use-package-modules calendar dav mail web-browsers xdisorg xorg)
@@ -128,11 +130,18 @@
                                             "/X11/ridge-view.jpg")))))))
 
      ;; On my work machine, Git must always use my work PGP key.
-     (gitconfig "timo.wilken@cern.ch" "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C")
+     (service home-git-service-type
+       (home-git-configuration
+        (default-email "timo.wilken@cern.ch")
+        (default-signing-key "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C")))
 
      (openssh-service #f)
 
-     (append %common-services %interactive-services pim-services
-             (gnupg-services "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C" #:gui-pinentry? #t))))))
+     (service home-gnupg-service-type
+       (home-gnupg-configuration
+        (default-key "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C")
+        (gui-pinentry? #t)))
+
+     (append %common-services %interactive-services pim-services)))))
 
 %cern-home
-- 
cgit v1.2.3