diff --git a/flake.nix b/flake.nix
index d7f52c7..6520738 100644
--- a/flake.nix
+++ b/flake.nix
@@ -161,6 +161,7 @@
                   "editor.fontLigatures" = true;
                   "security.workspace.trust.enabled" = false;
                   "remote.SSH.enableAgentForwarding" = true;
+                  "git.enableSmartCommit" = true;
                 };
               };
             };
@@ -209,6 +210,7 @@
                 };
                 init.defaultBranch = "main";
                 pull.rebase = true;
+                push.autoSetupRemote = true;
                 "url \"git@github.com:\"".insteadOf = "gh:";
                 "url \"git@gitlab.com:\"".insteadOf = "gl:";
                 "url \"git@git.lazarescu.xyz:2222/lazandrei19/\"".insteadOf = "lz:";