From 9937d9cdb3e038182c47444befec0cc78f617e2f Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Tue, 21 Nov 2023 13:56:43 +0100
Subject: [PATCH] git: more sensible config
---
home-manager-modules/git/default.nix | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/home-manager-modules/git/default.nix b/home-manager-modules/git/default.nix
index 5a34d15..98217f4 100644
--- a/home-manager-modules/git/default.nix
+++ b/home-manager-modules/git/default.nix
@@ -17,7 +17,13 @@ with lib;
signByDefault = true;
key = "6FC74C847011FD83";
};
- extraConfig.init.defaultBranch = "main";
+ extraConfig = {
+ init.defaultBranch = "main";
+ diff.colorMoved = "zebra";
+ pull.rebase = true;
+ fetch.prune = true;
+ rebase.autoStash = true;
+ };
};
home.extraActivationPath = [ pkgs.gnupg ];