From e1a5d35b6760a2907bcb1439eab802d1d54ea367 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 15 Sep 2021 10:38:24 +0200
Subject: git: sign by default for minijackson

---
 common/commandline/git.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index 914cdb4..e3ca37f 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -11,6 +11,11 @@ inputs:
       userEmail = "minijackson@riseup.net";
       userName = "Minijackson";
 
+      signing = {
+        signByDefault = true;
+        key = "minijackson@riseup.net";
+      };
+
       extraConfig =
         let
           deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta";
@@ -58,7 +63,15 @@ inputs:
   };
 
   home-manager.users.root = { ... }: {
-    programs.git =
-      lib.mkDefault config.home-manager.users.minijackson.programs.git;
+    programs.git = with lib;
+      mkMerge [
+        (mkDefault config.home-manager.users.minijackson.programs.git)
+        {
+          signing = {
+            signByDefault = false;
+            key = null;
+          };
+        }
+      ];
   };
 }
-- 
cgit v1.2.3