25.11

shared/home/default.nix

@@ -141,13 +141,15 @@ in
 
       git = {
         enable = true;
-        userEmail = email;
-        userName = "Motiejus Jakštys";
-        aliases = {
-          yolo = "commit --amend --no-edit -a";
-          pushf = "push --force-with-lease";
-        };
-        extraConfig = {
+        settings = {
+          user = lib.mkMerge [
+            { name = "Motiejus Jakštys"; }
+            (lib.mkIf (email != null) { inherit email; })
+          ];
+          alias = {
+            yolo = "commit --amend --no-edit -a";
+            pushf = "push --force-with-lease";
+          };
           log.date = "iso-strict-local";
           pull.ff = "only";
           core.abbrev = 12;
@@ -165,7 +167,6 @@ in
             confirm = "always";
             suppresscc = "self";
           };
-
         };
       };
 

shared/work/default.nix

@@ -74,7 +74,7 @@
       ANTHROPIC_VERTEX_PROJECT_ID = "chronosphere-rc-b";
     };
     programs = {
-      git.extraConfig = {
+      git.settings = {
         url."git@github.com:".insteadOf = "https://github.com";
         user.useConfigOnly = true;
       };