chore: update renamed options

Author: rhoriguchi

docs/src/reference/profiles/user.md

@@ -24,7 +24,7 @@ This option is required when [`skipTutorial`](/reference/root.md#skiptutorial) i
 
 **Type:** null or string
 
-**Default:** `config.programs.git.userEmail`
+**Default:** `config.programs.git.settings.user.email`
 
 **Example:** `email@example.com`
 
@@ -42,6 +42,6 @@ This option is required when [`skipTutorial`](/reference/root.md#skiptutorial) i
 
 **Type:** null or string
 
-**Default:** `config.programs.git.userName`
+**Default:** `config.programs.git.settings.user.name`
 
 **Example:** `John Doe`

docs/src/reference/user.md

@@ -25,7 +25,7 @@ This option is required when [`skipTutorial`](/reference/root.md#skiptutorial) i
 
 **Type:** null or string
 
-**Default:** `config.programs.git.userEmail`
+**Default:** `config.programs.git.settings.user.email`
 
 **Example:** `email@example.com`
 
@@ -43,6 +43,6 @@ This option is required when [`skipTutorial`](/reference/root.md#skiptutorial) i
 
 **Type:** null or string
 
-**Default:** `config.programs.git.userName`
+**Default:** `config.programs.git.settings.user.name`
 
 **Example:** `John Doe`

modules/user/profile-options.nix

@@ -3,8 +3,9 @@
 {
   email = lib.mkOption {
     type = with lib.types; nullOr str;
-    default = config.programs.git.userEmail;
-    defaultText = "config.programs.git.userEmail";
+    # TODO can be removed in the future when deprecated `config.programs.git.userEmail` is removed
+    default = config.programs.git.userEmail or (lib.attrByPath ["settings" "user" "email"] null config.programs.git);
+    defaultText = "config.programs.git.userEmail or config.programs.git.settings.user.email";
     example = "email@example.com";
     description = ''
       Email to use as commit author email.
@@ -20,8 +21,9 @@
 
   name = lib.mkOption {
     type = with lib.types; nullOr str;
-    default = config.programs.git.userName;
-    defaultText = "config.programs.git.userName";
+    # TODO can be removed in the future when deprecated `config.programs.git.userName` is removed
+    default = config.programs.git.userName or (lib.attrByPath ["settings" "user" "name"] null config.programs.git);
+    defaultText = "config.programs.git.userName or config.programs.git.settings.user.name";
     example = "John Doe";
     description = ''
       Name to use as commit author name.