Merge branch 'nix' into nix-work

nix/user/git.nix

@@ -20,10 +20,39 @@
     difftastic.enable = true;
 
     extraConfig = {
-      core = {
-        editor = "nvim";
+      column.ui = "auto";
+      branch.sort = "-committerdate";
+      tag.sort = "version:refname";
+      diff = {
+        algorithm = "histogram";
+        colorMoved = "plain";
+        mnemonicPrefix = "true";
+        renames = "true";
       };
-      push.default = "matching";
+      pull.rebase = "true";
+      push = {
+        default = "simple";
+        autoSetupRemote = "true";
+        followTags = "true";
+      };
+      fetch = {
+        prune = "true";
+        pruneTags = "true";
+        all = "true";
+      };
+      help.autocorrect = "prompt";
+      commit.verbose = "true";
+      rerere = {
+        enabled = "true";
+        autoupdate = "true";
+      };
+      rebase = {
+        autoSquas = "true";
+        autoStash = "true";
+        updateRefs = "true";
+      };
+      merge.conflictstyle = "zdiff3";
+      core.editor = "nvim";
       init.defaultBranch = "main";
       merge.conflicstyle = "zdiff3";
       fetch.prune = true;