1 files changed, 36 insertions, 1 deletions
diff --git a/home-manager/home.nix b/home-manager/home.nix
index a569419..cc62501 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -180,8 +180,43 @@
         userEmail = "devin.finlinson@pm.me";
         includes = [{path = "~/.gitconfig.local";}];
         extraConfig = {
-          core = {editor = "hx";};
+          core = {
+            editor = "hx";
+            excludesfile = "~/.gitignore";
+          };
+          column = { ui = "auto"; };
+          branch = { sort = "-committerdate"; };
+          tag = { sort = "version:refname"; };
+          init = { defaultBranch = "trunk"; };
+          diff = {
+            algorithm = "histogram";
+            colorMoved = "plain";
+            mnemonicPrefix = "true";
+            renames = "true";
+          };
+          push = {
+            default = "simple";
+            autoSetupRemote = "true";
+            folowTags = "true";
+          };
+          fetch = {
+            prune = true;
+            pruneTags = true;
+            all = true;
+          };
           pull = {rebase = false;};
+          merge = { conflictstyle = "zdiff3"; };
+          help = { autocorret = "prompt"; };
+          commit = { verbose = true; };
+          rerere = {
+            enabled = true;
+            autoupdate = true;
+          };
+          rebase = {
+            autoSquash = true;
+            autoStash = true;
+            updateRefs = true;
+          };
         };
       };