From 0e7be442abf430bcec6333f639cb19c17639e03a Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Fri, 13 Oct 2023 21:38:41 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20switch=20ssh=20git=20commit=20si?=
 =?UTF-8?q?gning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/git.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/git.nix b/modules/git.nix
index a0cc5c0..5869686 100644
--- a/modules/git.nix
+++ b/modules/git.nix
@@ -1,6 +1,9 @@
 _:
 
 {
+  # Allowed signers for git commit signing (referenced below).
+  home.file.".ssh/allowed_signers".text = "walkah@walkah.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl";
+
   programs = {
     gh = {
       enable = true;
@@ -22,15 +25,14 @@ _:
       };
 
       extraConfig = {
+        commit.gpgsign = true;
         github.user = "walkah";
+        gpg.format = "ssh";
+        gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
         init.defaultBranch = "main";
         pull.rebase = true;
         rebase.autoStash = true;
-      };
-
-      signing = {
-        key = "8896FEC44D47A81C";
-        signByDefault = true;
+        user.signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOxgkaPcUYkMjk7SEBFrYpJ2mGK+8iPgLYwV+XpNp5Nl";
       };
     };
   };