From 62c1d1c50d59036a20c3d6dc7d0d861ab7ae3401 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Sat, 11 Mar 2023 18:43:11 -0500
Subject: [PATCH] Tweak git a little more

---
 home-manager/common/programs/core.nix | 9 ++++++++-
 machines/wsl/home.nix                 | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/home-manager/common/programs/core.nix b/home-manager/common/programs/core.nix
index 52e9e4b..80be469 100644
--- a/home-manager/common/programs/core.nix
+++ b/home-manager/common/programs/core.nix
@@ -66,6 +66,13 @@ with lib; {
         tmate
       ];
     })
+    (mkIf (config.nathan.programs.util.git.enable
+      && config.nathan.programs.util.git.gpgSign) {
+        programs.git.signing = {
+          key = lib.mkDefault "B7A40A5D78C08885";
+          signByDefault = lib.mkDefault config.nathan.programs.util.git.gpgSign;
+        };
+      })
     (mkIf config.nathan.programs.util.git.enable {
       # Git adjacent packages
       home.packages = [
@@ -80,7 +87,7 @@ with lib; {
         userName = "Nathan McCarty";
         userEmail = "nathan@mccarty.io";
         signing = {
-          key = "B7A40A5D78C08885";
+          key = lib.mkDefault "B7A40A5D78C08885";
           signByDefault = config.nathan.programs.util.git.gpgSign;
         };
         ignores = [
diff --git a/machines/wsl/home.nix b/machines/wsl/home.nix
index 05c47b9..1c01ed9 100644
--- a/machines/wsl/home.nix
+++ b/machines/wsl/home.nix
@@ -22,4 +22,12 @@
       };
     };
   };
+  # Setup git commit signing with ssh key
+  programs.git = {
+    extraConfig = {
+      commit.gpgsign = true;
+      gpg.format = "ssh";
+      user.signingkey = "~/.ssh/id_ed25519.pub";
+    };
+  };
 }