2 files changed, 28 insertions, 18 deletions

diff --git a/modules/development/git/assertions.nix b/modules/development/git/assertions.nix
index c66714a..2baeced 100644
--- a/modules/development/git/assertions.nix
+++ b/modules/development/git/assertions.nix
@@ -3,24 +3,24 @@
 {
   assertions = [
     {
-      assertion = !config.development.git.signing.signByDefault || config.development.git.enable;
+      assertion = !config.development.git.signing.sign-by-default || config.development.git.enable;
       message = ''
-        development.git.signing.signByDefault is enabled but development.git.enable is not.
+        development.git.signing.sign-by-default is enabled but development.git.enable is not.
         Enable development.git before enabling commit signing.
       '';
     }
     {
       assertion =
-        !config.development.git.signing.signByDefault || config.development.git.signing.key != null;
+        !config.development.git.signing.sign-by-default || config.development.git.signing.key != null;
       message = ''
-        development.git.signing.signByDefault is enabled but development.git.signing.key is not set.
+        development.git.signing.sign-by-default is enabled but development.git.signing.key is not set.
         Set a GPG key ID before enabling commit signing by default.
       '';
     }
     {
-      assertion = !config.development.git.signing.signByDefault || config.security.gpg.enable;
+      assertion = !config.development.git.signing.sign-by-default || config.security.gpg.enable;
       message = ''
-        development.git.signing.signByDefault is enabled but security.gpg.enable is not.
+        development.git.signing.sign-by-default is enabled but security.gpg.enable is not.
         Commit signing requires the managed GPG configuration. Please enable security.gpg.
       '';
     }
diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix
index 15dcc80..f2a0d64 100644
--- a/modules/development/git/default.nix
+++ b/modules/development/git/default.nix
@@ -2,8 +2,12 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
+let
+  cfg = config.development.git;
+in
 {
   imports = [
     ./assertions.nix
@@ -30,29 +34,35 @@
       description = "Git email.";
     };
 
-    signing = {
-      key = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
-        default = null;
-        description = "GPG key ID used for signing commits.";
-      };
+    signing = lib.mkOption {
+      type = lib.types.submodule {
+        options = {
+          key = lib.mkOption {
+            type = lib.types.nullOr lib.types.str;
+            default = null;
+            description = "GPG key ID used for signing commits.";
+          };
 
-      signByDefault = lib.mkEnableOption "Sign commits by default.";
+          sign-by-default = lib.mkEnableOption "Sign commits by default.";
+        };
+      };
+      default = { };
+      description = "Git commit signing configuration.";
     };
   };
 
-  config = lib.mkIf config.development.git.enable {
+  config = lib.mkIf cfg.enable {
     programs.git = {
       enable = true;
       signing = {
-        key = config.development.git.signing.key;
-        signByDefault = config.development.git.signing.signByDefault;
+        key = cfg.signing.key;
+        signByDefault = cfg.signing.sign-by-default;
       };
       settings = lib.mkMerge [
         {
           user = {
-            name = config.development.git.username;
-            email = config.development.git.email;
+            name = cfg.username;
+            email = cfg.email;
           };
           core = {
             askPass = "";