diff --git a/users/gandalf/modules/git.nix b/users/gandalf/modules/git.nix
index 3f2ead9..8dc6f24 100644
--- a/users/gandalf/modules/git.nix
+++ b/users/gandalf/modules/git.nix
@@ -8,5 +8,10 @@
     };
     userEmail = "jacob.bachmann@posteo.de";
     userName = "Jacob Bachmann";
+    extraConfig = {
+      init = { defaultBranch = "main"; };
+      core.editor = "nvim";
+      pull.rebase = false;
+    };
   };
 }