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;
       };
     };