diff --git a/home/git/default.nix b/home/git/default.nix
index 687a795..e7a58d3 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -25,8 +25,8 @@
 
       credentials.helper = "store";
       pull.rebase = false;
-      push.autoSetupRemove = true;
-      branch.autoSetupMerge = true;
+      push.autoSetupRemote = true;
+      branch.autoSetupMerge = "always";
       init.defaultBranch = "master";
       diff.noprefix = true;
       color.ui = "auto";
diff --git a/home/utils/common.nix b/home/utils/common.nix
index 80ecfe9..5364a7b 100644
--- a/home/utils/common.nix
+++ b/home/utils/common.nix
@@ -29,6 +29,7 @@
     gocryptfs
     sshfs
     ncdu
+    jq
   ];
   home.sessionVariables = {
     XDG_CONFIG_HOME = "${config.xdg.configHome}";