From 7634895fe73ac1dc16ad1335ca206eb323b119df Mon Sep 17 00:00:00 2001
From: Lucas Sta Maria <lucas@priime.dev>
Date: Fri, 14 Mar 2025 11:30:30 -0400
Subject: [PATCH] fix(nix): add more git settings

---
 nix/hosts/framework/home.nix | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/nix/hosts/framework/home.nix b/nix/hosts/framework/home.nix
index f95830d..b93bbdf 100644
--- a/nix/hosts/framework/home.nix
+++ b/nix/hosts/framework/home.nix
@@ -364,6 +364,23 @@
   programs.home-manager.enable = true;
   programs.mu.enable = true;
 
+  programs.git = {
+    enable = true;
+    userName = "Lucas Sta Maria";
+    userEmail = "lucas@priime.dev";
+    signing = {
+      key = "2EAF5BA156A36810B057BF61F07FB16A826E3B47";
+      signByDefault = true;
+    };
+    extraConfig = {
+      pull.rebase = true;
+      github.user = "priime0";
+      credential.helper = "store";
+      merge.conflictstyle = "zdiff3";
+      diff.algorithm = "histogram";
+    };
+  };
+
   programs.direnv = {
     enable = true;
     enableFishIntegration = true;
@@ -394,21 +411,6 @@
     };
   };
 
-  programs.git = {
-    enable = true;
-    userName = "Lucas Sta Maria";
-    userEmail = "lucas@priime.dev";
-    signing = {
-      key = "2EAF5BA156A36810B057BF61F07FB16A826E3B47";
-      signByDefault = true;
-    };
-    extraConfig = {
-      pull.rebase = true;
-      github.user = "priime0";
-      credential.helper = "store";
-    };
-  };
-
   programs.gh = {
     enable = true;
     settings.editor = "emacsclient";