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.scm | 53 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) (limited to 'tw/home.scm') diff --git a/tw/home.scm b/tw/home.scm index e0f19a9f..6f53b8b2 100644 --- a/tw/home.scm +++ b/tw/home.scm @@ -172,8 +172,7 @@ auto-expand-secmem (local-file "home/files/prompt.zsh"))))) (simple-service 'common-config home-xdg-configuration-files-service-type - `(("git/config" ,(local-file "home/files/gitconfig")) - ("htop/htoprc" ,(local-file "home/files/htoprc")) + `(("htop/htoprc" ,(local-file "home/files/htoprc")) ("lesskey" ,(local-file "home/files/lesskey")) ("ranger/rc.conf" ,(local-file "home/files/ranger.conf")) ("tmux/tmux.conf" ,(local-file "home/files/tmux.conf")) @@ -411,9 +410,6 @@ auto-expand-secmem ("X11/XCompose" ,(local-file "home/files/XCompose")) ; see also: $XCOMPOSEFILE variable ("X11/Xresources" ,(local-file "home/files/Xresources")))) - (simple-service 'work-git-config home-files-service-type - `(("src/alice/.gitconfig" ,(local-file "home/files/gitconfig-cern")))) - (simple-service 'emacs-config home-xdg-configuration-files-service-type `(("emacs/include" ,(local-file "home/files/emacs-packages" #:recursive? #t)) ("emacs/early-init.el" ,(local-file "home/files/emacs-early-init.el")) @@ -561,3 +557,50 @@ auto-expand-secmem ,(local-file "home/files/emacsclient.desktop")))) (gnupg-services #:gui-pinentry? #t))) + +(define-public (gitconfig email signing-key) + (mixed-text-file "gitconfig" "\ +# This is Git's per-user configuration file. +[user] + name = Timo Wilken + email = " email " + signingkey = " signing-key " +[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 "/bin/kitty +kitten diff $LOCAL $REMOTE +[difftool \"kitty.gui\"] + cmd = " kitty "/bin/kitty " kitty "/bin/kitty +kitten diff $LOCAL $REMOTE +")) -- cgit v1.2.3