From ebd900f93941b9c834a1ba61b2f73682ea3df87d Mon Sep 17 00:00:00 2001
From: Jan Kremer <mail@jankremer.eu>
Date: Thu, 10 Jul 2025 14:22:22 +0200
Subject: [PATCH] git: Update config, reintroduce aliases, remove difftastic

---
 modules/home-manager/git/default.nix | 39 ++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/modules/home-manager/git/default.nix b/modules/home-manager/git/default.nix
index d413774..4259eef 100644
--- a/modules/home-manager/git/default.nix
+++ b/modules/home-manager/git/default.nix
@@ -13,28 +13,51 @@
       userName = "Jan Kremer";
       userEmail = "mail@jankremer.eu";
       lfs.enable = true;
-      difftastic.enable = true;
+
+      aliases = {
+        s = "status --short";
+        l = "log --all --oneline --graph";
+      };
 
       extraConfig = {
+        init.defaultBranch = "main";
         user.signingkey = "A7DA689CB3B078EC";
+
         credential.helper = "osxkeychain";
-        merge.conflictstyle = "zdiff3";
+        column.ui = "auto";
+        help.autocorrect = "prompt";
+        log.date = "iso";
+        branch.sort = "-committerdate";
         commit = {
           verbose = true;
           gpgsign = true;
         };
-        branch.sort = "-committerdate";
-        help.autocorrect = 10;
+        tag.sort = "version:refname";
         diff = {
           algorithm = "histogram";
           colorMoved = "default";
+          mnemonicPrefix = true;
+          renames = true;
         };
-        log.date = "iso";
-        rebase.autostash = true;
-        rerere.enabled = true;
         push = {
-          followtags = true;
           autoSetupRemote = true;
+          followTags = true;
+        };
+        pull.rebase = true;
+        fetch = {
+          all = true;
+          prune = true;
+          pruneTags = true;
+        };
+        merge.conflictstyle = "zdiff3";
+        rebase = {
+          autoSquash = true;
+          autoStash = true;
+          updateRefs = true;
+        };
+        rerere = {
+          enabled = true;
+          autoupdate = true;
         };
       };
     };