From f20f06ac84ec110ac5f9f9c601e073c209db5738 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen@aminda.eu>
Date: Thu, 14 Nov 2024 10:12:19 +0200
Subject: [PATCH] gitconfig: return to gpg

---
 .mikaela/gitconfig |  5 +++--
 conf/gitconfig     | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.mikaela/gitconfig b/.mikaela/gitconfig
index fa0a4687..afe68a95 100644
--- a/.mikaela/gitconfig
+++ b/.mikaela/gitconfig
@@ -6,11 +6,12 @@
 	# 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-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
 	# Public GPG Authentication Subkey in SSH format
 	#signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILGSHRVWaw4j1WXik/HQ2/m00NjKZLFeSxX4NEBRqevn
 	##wtop
 	#email = mikaela+digitalents@mikaela.info
 	#signingkey = 0xDF046339D69EB8C9
+
+# vim: filetype=gitconfig
diff --git a/conf/gitconfig b/conf/gitconfig
index 91816f24..16ba2ec1 100644
--- a/conf/gitconfig
+++ b/conf/gitconfig
@@ -8,6 +8,14 @@
 	pullen = pull --no-ff
 	verify = verify-commit HEAD
 
+#[gpg]
+	#format = ssh
+	#format = x509
+[gpg "ssh"]
+	allowedSignersFile = ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers
+#[gpg "x509"]
+#	program = gpgsm
+
 [core]
 	editor = nvim
 	autocrlf = input
@@ -45,13 +53,6 @@
 #	 diff = diff-highlight | less
 [interactive]
 #	 diffFilter = diff-highlight
-[gpg]
-	format = ssh
-	#format = x509
-[gpg "ssh"]
-	allowedSignersFile = ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers
-#[gpg "x509"]
-#	program = gpgsm
 [tag]
 	forceSignAnnotated = true
 [pull]
@@ -85,3 +86,5 @@
 # Don't complain about this path
 [safe]
 	directory = /home/linuxbrew/.linuxbrew
+
+# vim: filetype=gitconfig