Update old setting names

home/baseline/git.nix

@@ -3,27 +3,14 @@
 {
   programs.git = {
     enable = true;
-    userName = "Greg Hellings";
-    userEmail = "greg.hellings@gmail.com";
-    aliases = {
-      st = "status";
-      ci = "commit";
-      co = "checkout";
-      ups = "push -u origin HEAD";
-      amend = "commit --amend";
-    };
-    ignores = [
-      ".*.swp"
-      ".*.swo"
-      ".*.swn" # vim
-      ".idea" # IntelliJ
-      ".DS_Store" # Macs
-      "Thumbs.db" # Windows
-      ".tox" # Tox temp directory
-      ".eclipse" # These next two are created by VSCodium plugins
-      ".bazelproject"
-    ];
-    extraConfig = {
+    settings = {
+      alias = {
+        st = "status";
+        ci = "commit";
+        co = "checkout";
+        ups = "push -u origin HEAD";
+        amend = "commit --amend";
+      };
       branch.sort = "-committerdate";
       column.ui = "auto";
       commit.verbose = "true";
@@ -45,6 +32,21 @@
         enabled = "true";
       };
       tag.sort = "version:refname";
+      user = {
+        name = "Greg Hellings";
+        email = "greg.hellings@gmail.com";
+      };
     };
+    ignores = [
+      ".*.swp"
+      ".*.swo"
+      ".*.swn" # vim
+      ".idea" # IntelliJ
+      ".DS_Store" # Macs
+      "Thumbs.db" # Windows
+      ".tox" # Tox temp directory
+      ".eclipse" # These next two are created by VSCodium plugins
+      ".bazelproject"
+    ];
   };
 }