all repos — nixfiles @ b1eb6e4da088a1fd94881e6a54b983e16e546aee

System and user configuration, managed by nix and home-manager

update git config schema

Alan Pearce
commit

b1eb6e4da088a1fd94881e6a54b983e16e546aee

parent

f882cacd9b46335169efab7928e3f4a2da0f142c

1 file changed, 29 insertions(+), 27 deletions(-)

changed files
M user/settings/git.nix → user/settings/git.nix
@@ -7,9 +7,11 @@ }:
 {
   programs.git = {
     enable = true;
-    userName = "Alan Pearce";
-    userEmail = "alan@alanpearce.eu";
-    extraConfig = {
+    settings = {
+      user = {
+        name = "Alan Pearce";
+        email = "alan@alanpearce.eu";
+      };
       init = {
         defaultBranch = "main";
       };

@@ -90,30 +92,30 @@ };
       "branch.main" = {
         rebase = false;
       };
-    };
-    aliases = {
-      authors = "shortlog -s -n";
-      mup = "merge FETCH_HEAD";
-      rup = "rebase FETCH_HEAD";
-      ls = "ls-files";
-      st = "status -sb";
-      ci = "commit";
-      br = "branch";
-      co = "checkout";
-      sw = "switch";
-      rs = "restore";
-      lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\\\?[0-9]\" | tail -n1'";
-      pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'";
-      lg = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'";
-      ignored = "ls-files --others -i --exclude-standard";
-      clear = "clear-soft";
-      clear-hard = "!git-clear-hard";
-      dlog = "-c diff.external=difft log --ext-diff";
-      dshow = "-c diff.external=difft show --ext-diff";
-      ddiff = "-c diff.external=difft diff";
-      dl = "dlog";
-      ds = "dshow";
-      dt = "ddiff";
+      alias = {
+        authors = "shortlog -s -n";
+        mup = "merge FETCH_HEAD";
+        rup = "rebase FETCH_HEAD";
+        ls = "ls-files";
+        st = "status -sb";
+        ci = "commit";
+        br = "branch";
+        co = "checkout";
+        sw = "switch";
+        rs = "restore";
+        lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\\\?[0-9]\" | tail -n1'";
+        pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'";
+        lg = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'";
+        ignored = "ls-files --others -i --exclude-standard";
+        clear = "clear-soft";
+        clear-hard = "!git-clear-hard";
+        dlog = "-c diff.external=difft log --ext-diff";
+        dshow = "-c diff.external=difft show --ext-diff";
+        ddiff = "-c diff.external=difft diff";
+        dl = "dlog";
+        ds = "dshow";
+        dt = "ddiff";
+      };
     };
     ignores = [
       ".DS_Store"