diff --git a/nix-os/core.nix b/nix-os/core.nix
index d79f6e9..a5633da 100644
--- a/nix-os/core.nix
+++ b/nix-os/core.nix
@@ -29,6 +29,12 @@
     ddrescue
   ];
 
+  programs.git.config = {
+    init.defaultBranch = "main";
+    merge.conflictstyle = "diff3";
+    rerere.enabled = true;
+  };
+
   # Enable fail2ban because of the OpenSSH server
   services.fail2ban = {
     enable = true;