diff --git a/modules/home/programs/git/default.nix b/modules/home/programs/git/default.nix
index 5b05bfb4..eb5f03bd 100644
--- a/modules/home/programs/git/default.nix
+++ b/modules/home/programs/git/default.nix
@@ -56,14 +56,31 @@ in
           options.line-numbers = true;
         };
         extraConfig = {
+          branch.sort = "-committerdate";
+          column.ui = "auto";
           core.editor = lib.getExe pkgs.py.nvim;
-          init.defaultBranch = "main";
-          pull.rebase = false;
           "credential \"https://git.pyrox.dev\"".username = "pyrox";
           credential.helper = "rbw";
-          gpg = {
-            ssh.allowedSignersFile = "~/.ssh/authorized_signatures";
+          diff = {
+            algorithm = "histogram";
+            colorMoved = "plain";
+            mnemonicPrefix = true;
+            renames = true;
+          };
+          fetch = {
+            all = true;
+            prune = true;
+            pruneTags = true;
+          };
+          gpg.ssh.allowedSignersFile = "~/.ssh/authorized_signatures";
+          init.defaultBranch = "main";
+          pull.rebase = false;
+          push = {
+            autoSetupRemote = true;
+            followTags = true;
           };
+          rebase.updateRefs = true;
+          tag.sort = "version:refname";
         };
         lfs = {
           enable = true;