diff --git a/system/shared/home-manager.nix b/system/shared/home-manager.nix
index e3fecb9..af1c8af 100644
--- a/system/shared/home-manager.nix
+++ b/system/shared/home-manager.nix
@@ -218,15 +218,18 @@ in
       help.autocorrect = "1";
       init.defaultBranch = "main";
       merge.ff = "only";
-      rebase = {
-        autosquash = true;
-        autostash = true;
+      push = {
+        autoSetupRemote = true;
+        default = "upstream";
       };
-      push.default = "upstream";
       pull = {
         ff = "only";
         rebase = true;
       };
+      rebase = {
+        autosquash = true;
+        autostash = true;
+      };
     };
   };