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/lap.scm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

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

diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index c166c75e..ae5fb629 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -38,6 +38,8 @@
   #:use-module ((nongnu packages steam-client)
                 #:select (steam))
   #:use-module (tw home)
+  #:use-module (tw services git)
+  #:use-module (tw services gnupg)
   #:use-module (tw packages scanner)
   #:use-module (tw services restic)
   #:use-module (tw theme))
@@ -202,12 +204,24 @@
 
      ;; On my private machine, I want to use my private PGP key normally, and
      ;; my work key only for work repositories.
-     (gitconfig "git@twilken.net" "53EC3C06856883DD92355BC22FC78504681F69B0"
-                '("cern" "~/src/alice" "timo.wilken@cern.ch" "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C"))
+     (service home-git-service-type
+       (home-git-configuration
+        (default-email "git@twilken.net")
+        (default-signing-key "53EC3C06856883DD92355BC22FC78504681F69B0")
+        (identities
+         (list (home-git-identity
+                (name "cern")
+                (root-directory "~/src/alice")
+                (email "timo.wilken@cern.ch")
+                (signing-key "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C"))))))
 
      (openssh-service #t)
 
-     (append pim-services %interactive-services %common-services
-             (gnupg-services "53EC3C06856883DD92355BC22FC78504681F69B0" #:gui-pinentry? #t))))))
+     (service home-gnupg-service-type
+       (home-gnupg-configuration
+        (default-key "53EC3C06856883DD92355BC22FC78504681F69B0")
+        (gui-pinentry? #t)))
+
+     (append pim-services %interactive-services %common-services)))))
 
 %lap-home
-- 
cgit v1.2.3