From e299e679691a0a7d08a76d81f9bee802694763af Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Mon, 22 May 2023 23:21:50 +0200
Subject: Fix PGP key in private gitconfig

---
 tw/home/cern.scm        |  4 ++++
 tw/home/files/gitconfig | 43 -------------------------------------------
 tw/home/lap.scm         |  6 ++++++
 3 files changed, 10 insertions(+), 43 deletions(-)
 delete mode 100644 tw/home/files/gitconfig

(limited to 'tw/home')

diff --git a/tw/home/cern.scm b/tw/home/cern.scm
index d9ea38bb..e7b4124d 100644
--- a/tw/home/cern.scm
+++ b/tw/home/cern.scm
@@ -127,6 +127,10 @@
                              (string-append (getenv "XDG_CONFIG_HOME")
                                             "/X11/ridge-view.jpg")))))))
 
+     ;; On my work machine, Git must always use my work PGP key.
+     (simple-service 'gitconfig home-xdg-configuration-files-service-type
+       `(("git/config" ,(gitconfig "timo.wilken@cern.ch" "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C"))))
+
      (openssh-service #f)
 
      (append %common-services %interactive-services pim-services)))))
diff --git a/tw/home/files/gitconfig b/tw/home/files/gitconfig
deleted file mode 100644
index 6bed5cc8..00000000
--- a/tw/home/files/gitconfig
+++ /dev/null
@@ -1,43 +0,0 @@
-# This is Git's per-user configuration file.
-[user]
-	name = Timo Wilken
-	email = timo.wilken@cern.ch
-	signingkey = C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C
-[commit]
-	gpgsign = true
-[url "https://"]
-	insteadOf = git://
-[url "ssh://git@gitlab.cern.ch:7999/"]
-	insteadOf = https://gitlab.cern.ch/
-[url "ssh://git@ssh.github.com/"]
-	insteadOf = gh:
-[gui]
-	fontui = -family \"Fira Sans\" -size 10 -weight normal -slant roman -underline 0 -overstrike 0
-	fontdiff = -family \"Hermit\" -size 10 -weight normal -slant roman -underline 0 -overstrike 0
-	tabsize = 4
-[merge]
-	summary = true
-	conflictstyle = diff3
-[color]
-	ui = auto
-[pull]
-	rebase = false
-	ff = only
-[alias]
-	glog = log --decorate --graph --oneline
-	plog = log --decorate --graph --oneline --pretty=tformat:\"%C(yellow)%h %Cgreen%as %Cblue%<(10,trunc)%an%Cred%d%Creset %s\"
-[init]
-	defaultBranch = master
-[advice]
-	detachedHead = false
-# https://sw.kovidgoyal.net/kitty/kittens/diff/
-[diff]
-	tool = kitty
-	guitool = kitty.gui
-[difftool]
-	prompt = false
-	trustExitCode = true
-[difftool "kitty"]
-	cmd = kitty +kitten diff $LOCAL $REMOTE
-[difftool "kitty.gui"]
-	cmd = kitty kitty +kitten diff $LOCAL $REMOTE
diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index 44f345da..2b3c848d 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -199,6 +199,12 @@
                              (string-append (getenv "HOME")
                                             "/pictures/Backgrounds/greece/IMG_20181201_104748_DRO.jpg")))))))
 
+     ;; On my private machine, I want to use my private PGP key normally, and
+     ;; my work key only for work repositories.
+     (simple-service 'gitconfig home-xdg-configuration-files-service-type
+       `(("git/config" ,(gitconfig "git@twilken.net" "53EC3C06856883DD92355BC22FC78504681F69B0"))
+         ("src/alice/.gitconfig" ,(local-file "files/gitconfig-cern"))))
+
      (openssh-service #t)
 
      (append pim-services %interactive-services %common-services)))))
-- 
cgit v1.2.3