diff --git a/flake.lock b/flake.lock
index 9eb9c3b..c1cf634 100644
--- a/flake.lock
+++ b/flake.lock
@@ -269,7 +269,6 @@
       },
       "original": {
         "owner": "chayleaf",
-        "ref": "akkoma",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index cfcdc4d..66b219b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
     #nixpkgs.url = "github:nixos/nixpkgs/3dc2b4f8166f744c3b3e9ff8224e7c5d74a5424f";
     # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs.url = "github:chayleaf/nixpkgs/akkoma";
+    nixpkgs.url = "github:chayleaf/nixpkgs";
     nixpkgs2.url = "github:nixos/nixpkgs/master";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     mobile-nixos = {
diff --git a/home/common/general.nix b/home/common/general.nix
index 6c4e2dc..cb44dd2 100644
--- a/home/common/general.nix
+++ b/home/common/general.nix
@@ -107,6 +107,10 @@
         # ...and prefer getting passwords from libsecret (and storing them there)
         credential.helper = "${pkgs.gitAndTools.gitFull}/bin/git-credential-libsecret";
         init.defaultBranch = "master";
+        # no need for git pust -u origin <branch>
+        push.autoSetupRemote = true;
+        # allow different upstream branch name
+        push.default = "upstream";
       };
       lfs.enable = true;
     };