diff --git a/nate/modules/home-manager/home.nix b/nate/modules/home-manager/home.nix
index c40e85c..b21f92c 100644
--- a/nate/modules/home-manager/home.nix
+++ b/nate/modules/home-manager/home.nix
@@ -142,6 +142,14 @@
       enable = true;
       userEmail = email;
       userName = fullName;
+      extraConfig = {
+        init = { defaultBranch = "main"; };
+        pull = { ff = "only"; };
+        merge = { conflictStyle="zdiff3"; };
+        push = { autoSetupRemote="true"; };
+      };
+      delta.enable = true;
+
   };
 
   programs = {