From b71d0194efac7e9c7f1e9395a861f32059a7ef4d Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Mon, 10 Jun 2024 10:35:38 +0300
Subject: [PATCH] attempt to cleanup user from gitconfig

---
 .mikaela/gitconfig | 81 ----------------------------------------------
 .mikaela_install   |  2 +-
 conf/gitconfig     | 17 ++--------
 3 files changed, 4 insertions(+), 96 deletions(-)

diff --git a/.mikaela/gitconfig b/.mikaela/gitconfig
index 931c030e..9288dcf4 100644
--- a/.mikaela/gitconfig
+++ b/.mikaela/gitconfig
@@ -12,84 +12,3 @@
 	##wtop
 	#email = mikaela+digitalents@mikaela.info
 	#signingkey = 0xDF046339D69EB8C9
-[alias]
-	cleandi = clean -di
-	cleandix = clean -dix
-	# From http://progit.org/book/ch2-7.html
-	last = cat-file commit HEAD
-	mergen = merge --no-ff
-	pulln = pull --no-ff
-	pullen = pull --no-ff
-	verify = verify-commit HEAD
-
-[core]
-	editor = nvim
-	autocrlf = input
-	safecrlf = warn
-[color]
-	# From git manpage and http://book.git-scm.com/5_customizing_git.html
-	branch = true
-	diff = true
-	grep = true
-	interactive = true
-	pager = true
-	showbranch = true
-	status = true
-	ui = true
-[push]
-	default = current
-	gpgSign = if-asked
-	autoSetupRemote = true
-	recurseSubmodules = on-demand
-[credential]
-	helper = cache --timeout=86400
-[merge]
-	ff = only
-	renormalize = true
-[format]
-	signOff = true
-[commit]
-	gpgsign = true
-[diff]
-	compactionHeuristic = true
-	algorithm = histogram
-[pager]
-#	 log = diff-highlight | less
-#	 show = diff-highlight | less
-#	 diff = diff-highlight | less
-[interactive]
-#	 diffFilter = diff-highlight
-[gpg]
-	format = ssh
-	#format = x509
-[gpg "ssh"]
-	allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers
-#[gpg "x509"]
-#	program = gpgsm
-[tag]
-	forceSignAnnotated = true
-[pull]
-	ff = only
-[init]
-	defaultBranch = cxefa
-	# https://pre-commit.com/#pre-commit-init-templatedir
-	# pre-commit init-templatedir ~/.git-template
-	templateDir = ~/.git-template
-[advice]
-	# I am not developing in detached head state, I generally want to compile
-	# a specific version of a program and I know how to get out of it
-	detachedHead = false
-[status]
-	submodulesummary = 1
-[submodule]
-	recurse = true
-[lfs]
-	setlockablereadonly = true
-	locksverify = true
-[log]
-	mailmap = true
-	showSignature = true
-# https://sandrotosi.blogspot.com/2020/10/multiple-git-configurations-depending.html?m=1
-# see also .mikaela/2src-gitconfig within the same shell-things repo
-[includeIf "gitdir:~/2src/"]
-	path = ~/2src/gitconfig
diff --git a/.mikaela_install b/.mikaela_install
index 9f9e60d6..6326f78d 100755
--- a/.mikaela_install
+++ b/.mikaela_install
@@ -12,7 +12,7 @@ cat .mikaela/gpg.conf >~/.gnupg/gpg.conf
 cat .mikaela/pastebinit.xml >~/.pastebinit.xml
 cat .mikaela/environment >~/.environment
 mkdir ~/.config/git
-cat .mikaela/gitconfig >~/.config/git/config
+#cat .mikaela/gitconfig >~/.config/git/config
 cat .gitattributes >~/.config/git/attributes
 mkdir -p ~/.ssh
 cat .mikaela/keys/authorized_keys >~/.ssh/authorized_keys
diff --git a/conf/gitconfig b/conf/gitconfig
index 51601d7c..803219ca 100644
--- a/conf/gitconfig
+++ b/conf/gitconfig
@@ -1,17 +1,3 @@
-[user]
-	#name = Aminda Suomalainen
-	#email = suomalainen+git@mikaela.info
-	# Email stored on my FINEID
-	#email = suomalainen@mikaela.info
-	# Aminda Suomalainen FINEID 20.12.2021-20.12.2026
-	# NOTE: This is a PUBLIC key, the secret key is non-exportable on
-	# the SMARTCARD. See also https://gitea.blesmrt.net/mikaela/ssh-allowed_signers/src/branch/cxefa/README.md#where-to-find-keys
-	#signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM=
-	#signingkey = ~/.ssh/id_ed25519.pub
-	#signingkey = 0x414E406A
-	##wtop
-	#email = mikaela+digitalents@mikaela.info
-	#signingkey = 0xDF046339D69EB8C9
 [alias]
 	cleandi = clean -di
 	cleandix = clean -dix
@@ -89,6 +75,9 @@
 [log]
 	mailmap = true
 	showSignature = true
+[include]
+	path = ~/.shell-things/.mikaela/gitconfig
+	path = ~/.gitconfig2
 # https://sandrotosi.blogspot.com/2020/10/multiple-git-configurations-depending.html?m=1
 # see also .mikaela/2src-gitconfig within the same shell-things repo
 [includeIf "gitdir:~/2src/"]