git: aliases / user options -> settings

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>

modules/programs/git.nix

@@ -48,27 +48,6 @@ in
           '';
         };
 
-        userName = mkOption {
-          type = types.nullOr types.str;
-          default = null;
-          description = "Default user name to use.";
-        };
-
-        userEmail = mkOption {
-          type = types.nullOr types.str;
-          default = null;
-          description = "Default user email to use.";
-        };
-
-        aliases = mkOption {
-          type = types.attrsOf types.str;
-          default = { };
-          example = {
-            co = "checkout";
-          };
-          description = "Git aliases to define.";
-        };
-
         signing = {
           key = mkOption {
             type = types.nullOr types.str;
@@ -296,17 +275,55 @@ in
       };
     };
 
-  imports = [
+  imports =
-    (lib.mkRenamedOptionModule
+    let
-      [ "programs" "git" "signing" "gpgPath" ]
+      oldPrefix = [
-      [
         "programs"
         "git"
-        "signing"
+      ];
-        "signer"
+      newPrefix = [
+        "programs"
+        "git"
+        "settings"
+      ];
+    in
+    [
+      (lib.mkRenamedOptionModule
+        [ "programs" "git" "signing" "gpgPath" ]
+        [
+          "programs"
+          "git"
+          "signing"
+          "signer"
+        ]
+      )
+      (lib.mkRenamedOptionModule [ "programs" "git" "extraConfig" ] [ "programs" "git" "settings" ])
+    ]
+    ++ (lib.hm.deprecations.mkSettingsRenamedOptionModules oldPrefix newPrefix
+      {
+        transform = x: x;
+      }
+      [
+        {
+          old = [ "userName" ];
+          new = [
+            "user"
+            "name"
+          ];
+        }
+        {
+          old = [ "userEmail" ];
+          new = [
+            "user"
+            "email"
+          ];
+        }
+        {
+          old = [ "aliases" ];
+          new = [ "alias" ];
+        }
       ]
-    )
+    );
-  ];
 
   config = mkIf cfg.enable (
     lib.mkMerge [
@@ -331,11 +348,6 @@ in
           }
         ];
 
-        programs.git.iniContent.user = {
-          name = mkIf (cfg.userName != null) cfg.userName;
-          email = mkIf (cfg.userEmail != null) cfg.userEmail;
-        };
-
         xdg.configFile = {
           "git/config".text = lib.generators.toGitINI cfg.iniContent;
 
@@ -438,8 +450,6 @@ in
         };
       })
 
-      (mkIf (cfg.aliases != { }) { programs.git.iniContent.alias = cfg.aliases; })
-
       (mkIf (cfg.settings != { }) {
         programs.git.iniContent = cfg.settings;
       })

tests/modules/programs/git/git-with-email.nix

@@ -7,8 +7,12 @@
 
   programs.git = {
     enable = true;
-    userEmail = "hm@example.com";
+    settings = {
-    userName = "H. M. Test";
+      user = {
+        email = "hm@example.com";
+        name = "H. M. Test";
+      };
+    };
   };
 
   home.stateVersion = "20.09";

tests/modules/programs/git/git-with-lfs.nix

@@ -1,8 +1,12 @@
 {
   programs.git = {
     enable = true;
-    userName = "John Doe";
+    settings = {
-    userEmail = "user@example.org";
+      user = {
+        name = "John Doe";
+        email = "user@example.org";
+      };
+    };
 
     lfs = {
       enable = true;

tests/modules/programs/git/git-with-msmtp.nix

@@ -8,8 +8,12 @@
   programs.git = {
     enable = true;
     signing.signer = "path-to-gpg";
-    userEmail = "hm@example.com";
+    settings = {
-    userName = "H. M. Test";
+      user = {
+        email = "hm@example.com";
+        name = "H. M. Test";
+      };
+    };
   };
 
   home.stateVersion = "20.09";

tests/modules/programs/git/git-with-signing-key-id-legacy.nix

@@ -3,8 +3,12 @@
   config = {
     programs.git = {
       enable = true;
-      userName = "John Doe";
+      settings = {
-      userEmail = "user@example.org";
+        user = {
+          name = "John Doe";
+          email = "user@example.org";
+        };
+      };
 
       signing = {
         gpgPath = "path-to-gpg";

tests/modules/programs/git/git-with-signing-key-id.nix

@@ -1,8 +1,12 @@
 {
   programs.git = {
     enable = true;
-    userName = "John Doe";
+    settings = {
-    userEmail = "user@example.org";
+      user = {
+        name = "John Doe";
+        email = "user@example.org";
+      };
+    };
 
     signing = {
       signer = "path-to-ssh";

tests/modules/programs/git/git-without-signing-key-id.nix

@@ -1,8 +1,12 @@
 {
   programs.git = {
     enable = true;
-    userName = "John Doe";
+    settings = {
-    userEmail = "user@example.org";
+      user = {
+        name = "John Doe";
+        email = "user@example.org";
+      };
+    };
 
     signing = {
       signer = "path-to-gpg";

tests/modules/programs/git/git-without-signing.nix

@@ -1,8 +1,12 @@
 {
   programs.git = {
     enable = true;
-    userName = "John Doe";
+    settings = {
-    userEmail = "user@example.org";
+      user = {
+        name = "John Doe";
+        email = "user@example.org";
+      };
+    };
   };
 
   home.stateVersion = "25.05";

tests/modules/programs/git/git.nix

@@ -29,16 +29,20 @@ in
     {
       enable = true;
       package = pkgs.gitMinimal;
-      aliases = {
+      settings = {
-        a1 = "foo";
+        alias = {
-        a2 = "bar";
+          a1 = "foo";
-        escapes = ''"\n	'';
+          a2 = "bar";
-      };
+          escapes = ''"\n	'';
-      extraConfig = {
+        };
         extra = {
           name = "value";
           multiple = [ 1 ];
         };
+        user = {
+          email = "user@example.org";
+          name = "John Doe";
+        };
       };
       ignores = [
         "*~"
@@ -66,13 +70,10 @@ in
         key = "00112233445566778899AABBCCDDEEFF";
         signByDefault = true;
       };
-      userEmail = "user@example.org";
-      userName = "John Doe";
       lfs.enable = true;
     }
 
     {
-      aliases.a2 = lib.mkForce "baz";
       settings.alias.a2 = lib.mkForce "baz";
       settings."extra \"backcompat.with.dots\"".previously = "worked";
       settings.extra.boolean = true;