diff options
author | Timo Wilken | 2023-07-24 13:12:11 +0200 |
---|---|---|
committer | Timo Wilken | 2023-08-02 20:28:10 +0200 |
commit | 506d9e9f98ac498389f6c2428c760bf0819c32d7 (patch) | |
tree | 004695763037a429ea3b1d530b3f53e102f0a51f /tw/home | |
parent | 9db8734147731fe810ffcec9952d51ca60b69b5f (diff) |
Fix git work identity config
The work gitconfig wasn't getting applied. Explicitly include it in the main
gitconfig in an extensible way.
Diffstat (limited to 'tw/home')
-rw-r--r-- | tw/home/cern.scm | 3 | ||||
-rw-r--r-- | tw/home/lap.scm | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tw/home/cern.scm b/tw/home/cern.scm index e7b4124d..71da61fa 100644 --- a/tw/home/cern.scm +++ b/tw/home/cern.scm @@ -128,8 +128,7 @@ "/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")))) + (gitconfig "timo.wilken@cern.ch" "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C") (openssh-service #f) diff --git a/tw/home/lap.scm b/tw/home/lap.scm index 547715f1..7a6af2d4 100644 --- a/tw/home/lap.scm +++ b/tw/home/lap.scm @@ -196,9 +196,8 @@ ;; 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")))) + (gitconfig "git@twilken.net" "53EC3C06856883DD92355BC22FC78504681F69B0" + '("cern" "~/src/alice" "timo.wilken@cern.ch" "C2249BBE5E8761C943A0CFA1B7B3914BF63ACD7C")) (openssh-service #t) |