From 4a2fa323381b2b80ad9da46f9807abf12f23ad9e Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sat, 15 Mar 2025 18:36:33 +0100
Subject: home/minimal: further git options

---
 home/home-minimal.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'home/home-minimal.nix')

diff --git a/home/home-minimal.nix b/home/home-minimal.nix
index 78d6014..cfeb2b2 100644
--- a/home/home-minimal.nix
+++ b/home/home-minimal.nix
@@ -131,13 +131,26 @@
     extraConfig = {
       log.showSignature = true;
       init.defaultBranch = "main";
-      alias.search = "!git log --format='tformat:%h %cs %s' --no-show-signature | fzf --multi --preview 'git show {+1}|bat -p -lpatch --color=always' | cut -f1 -d\" \" | wl-copy -n && wl-paste";
-      alias.where = "!fish -c git-where";
       merge.conflictStyle = "zdiff3";
       push.autoSetupRemote = true;
+      pull.rebase = true;
       commit.verbose = true;
       rerere.enabled = true;
       branch.sort = "-authordate";
+      tag.sort = "version:refname";
+      column.ui = "auto";
+
+      diff = {
+        algorithm = "histogram";
+        colorMoved = "plain";
+        mnemoicPrefix = true;
+        renames = true;
+      };
+
+      alias = {
+        search = "!git log --format='tformat:%h %cs %s' --no-show-signature | fzf --multi --preview 'git show {+1}|bat -p -lpatch --color=always' | cut -f1 -d\" \" | wl-copy -n && wl-paste";
+        where  = "!fish -c git-where";
+      };
 
       merge.mergiraf = {
         name = "mergiraf";
-- 
cgit v1.2.3