From 799a42082d9e8b0c1cabf9abaaa30645fc5c0ab9 Mon Sep 17 00:00:00 2001
From: Pierre Martin <pierre@front-commerce.com>
Date: Wed, 14 Jun 2023 06:12:43 +0200
Subject: [PATCH] feat(git): misc config updates + tig -> gitui

---
 packages.nix     |  2 --
 programs/git.nix | 11 +++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages.nix b/packages.nix
index fa7bd6d..8148f13 100644
--- a/packages.nix
+++ b/packages.nix
@@ -56,7 +56,6 @@
     fzf
     bat
     bat-extras.prettybat
-    delta
 
     atool
     unzip
@@ -78,7 +77,6 @@
     udiskie
     tldr
 
-    gitAndTools.tig
     git-filter-repo
     meld
     glab
diff --git a/programs/git.nix b/programs/git.nix
index 1a11a97..4549bfc 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -1,10 +1,12 @@
 { pkgs, ... }:
 
 {
+  programs.gitui.enable = true;
   programs.git = {
     enable = true;
     package = pkgs.gitAndTools.gitFull;
 
+    # TODO: https://www.imagile.fr/utiliser-automatiquement-plusieurs-identites-sur-git/
     userEmail = "pierre@front-commerce.com";
     userName = "Pierre Martin";
 
@@ -25,11 +27,9 @@
       ".vscode"
     ];
 
+    # see https://github.com/dandavison/delta#get-started
+    delta.enable = true;
     extraConfig = {
-      # see https://github.com/dandavison/delta#get-started
-      core.pager = "delta";
-      interactive.diffFilter = "delta --color-only";
-      delta.navigate = true;
       merge.conflictstyle = "diff3";
       diff.colorMoved = "default";
 
@@ -46,6 +46,9 @@
 
       # see https://michaelheap.com/git-ignore-rev/
       blame.ignoreRevsFile = ".git-blame-ignore-revs";
+
+      # see https://adamj.eu/tech/2022/10/15/how-to-rebase-stacked-git-branches/
+      rebase.updateRefs = true;
     };
   };
 }