From 229cec627fb280778ead4e128236d55d75d61d69 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Thu, 25 Apr 2024 18:34:02 +0200
Subject: [PATCH] feat(git): add delta and some config

---
 programs/git.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/programs/git.nix b/programs/git.nix
index 2d1fa02..17ad880 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -12,11 +12,18 @@
         signByDefault = true;
       };
 
+      delta.enable = true;
+
       extraConfig = {
         init.defaultBranch = "main";
         core.autocrlf = "input";
         push.autoSetupRemote = true;
         gpg.format = "ssh";
+	merge.conflictStyle = "zdiff3";
+	rebase.autoStash = true;
+	status.submoduleSummary = true;
+	diff.submodule = "log";
+	submodule.recurse = true;
       };
     };