diff --git a/home/server.nix b/home/server.nix
index cb0f437..62877bb 100644
--- a/home/server.nix
+++ b/home/server.nix
@@ -32,11 +32,26 @@
 
   programs.git = {
     enable = true;
-    userName = "Dennis Schoepf";
-    userEmail = "me@dnsc.io";
-    extraConfig = {
+    settings = {
+      init = {
+        defaultBranch = "main";
+      };
+
+      core = {
+        ignorecase = "false";
+      };
+
       pull = {
-        rebase = true;
+        rebase = false;
+      };
+
+      push = {
+        autoSetupRemote = true;
+      };
+
+      user = {
+        name = "Dennis Schoepf";
+        email = "me@dnsc.io";
       };
     };
   };