Add option to default sign with git

machine/nucturne/default.nix

@@ -3,6 +3,7 @@
   variables= {
     hostName = "nucturne";
     graphical = true;
+    git.signDefault = true;
   };
 
   boot.extraModulePackages = [

machine/stel-xps/default.nix

@@ -5,8 +5,11 @@
   variables = {
     hostName = "stel-xps";
     graphical = true;
-    git.key = "0x4998BEEE";
-    git.gpgsm = true;
+    git = {
+      key = "0x4998BEEE";
+      gpgsm = true;
+      signDefault = true;
+    };
   };
   #networking.hostName = "stel-xps"; # define the hostname
 

options.nix

@@ -29,6 +29,11 @@
         default = false;
         description = "Whether to use gpgsm for commit signatures";
       };
+      signDefault = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to force signing commits or not";
+      };
     };
   };
 }

users/ellmau/git.nix

@@ -17,7 +17,10 @@
           #  format = "x509";
           #  program = "gpgsm";
           #};
-          user = { signingKey = config.variables.git.key;  };
+          user = {
+            signingKey = config.variables.git.key;
+            signByDefault = config.variables.git.signDefault;
+          };
           init = { defaultBranch = "main";};
           branch = { autosetuprebase = "always";};
           safe.directory = [ "/etc/nixos" ];