From 6e943f56f3f0c95ee9321270ed4406da36a16259 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Wed, 14 Feb 2024 11:40:34 +0100
Subject: [PATCH] Git: config improvements

---
 modules/hm/git.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/hm/git.nix b/modules/hm/git.nix
index 0f0ba90..4f8452e 100644
--- a/modules/hm/git.nix
+++ b/modules/hm/git.nix
@@ -58,7 +58,7 @@ let
     "gma" = "git merge --abort";
     "gp" = "git push";
     "gpa" = "git push --all";
-    "gpf!" = "git push --force";
+    "gpf!" = "git push --force-with-lease";
     "gpoat" = "git push origin --all && git push origin --tags";
     "gpu" = "git push upstream";
     "gpv" = "git push -v";
@@ -102,9 +102,12 @@ in
       # };
       extraConfig = {
         "add.interactive".useBuiltin = false;
-        commit.gpgSign = true;
-        core.editor = "hx";
         credential.helper = "libsecret";
+        commit.gpgSign = true;
+        core = {
+          editor = "hx";
+          fsmonitor = true;
+        };
         delta = {
           line-numbers = true;
           navigate = true;
@@ -124,6 +127,10 @@ in
         };
         pull.rebase = true;
         rebase.autoStash = true;
+        rerere = {
+          enabled = true;
+          autoUpdate = true;
+        };
         user.signingKey = "berto.f@protonmail.com";
       };
       lfs.enable = true;