From 015b448ef0a8c3fd0df68aecde97d68fe2c0f0f2 Mon Sep 17 00:00:00 2001
From: Stefan Ellmauthaler <stefan.ellmauthaler@tu-dresden.de>
Date: Thu, 9 Jun 2022 09:32:41 +0200
Subject: [PATCH] Add programs.git.extraConfig.commit.gpgsign

programs.git.signing.signByDefault sets another program than gpgsm and
introduces conflicting definitions
---
 modules/users.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/users.nix b/modules/users.nix
index c236832..e95766d 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -96,7 +96,6 @@ with lib; {
           programs.git = {
             userEmail = meta.mailAddress;
             userName = meta.description;
-            signing.signByDefault = meta.git.signDefault;
             extraConfig = {
               gpg = lib.mkIf meta.git.gpgsm {
                 format = "x509";
@@ -105,6 +104,9 @@ with lib; {
               user = {
                 signingKey = meta.git.key;
               };
+              commit = {
+                gpgsign = meta.git.signDefault;
+              };
             };
           };
         };