From dd7f3f0d958beb08faa923e71923841c93b97ba4 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 21 Sep 2022 17:08:50 +0100
Subject: [PATCH] feat(git): more configuration

---
 home.nix | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/home.nix b/home.nix
index 26e85cd0..e8222823 100644
--- a/home.nix
+++ b/home.nix
@@ -72,6 +72,40 @@
       wip = "!git add . && git commit -m 'wip'";
       worktrees = "worktree list";
     };
+
+    extraConfig = {
+      branch = {
+        autosetupmerge = true;
+        autosetuprebase = "always";
+      };
+      checkout.defaultRemote = "origin";
+      color.ui = true;
+      commit = {
+        template = "~/.gitmessage";
+        verbose = true;
+      };
+      core = {
+        editor = "nvim";
+        excludesFile = "~/.gitignore-global";
+        pager = "delta";
+      };
+      delta.line-numbers = true;
+      diff.tool = "vimdiff";
+      fetch.prune = true;
+      grep.lineNumber = true;
+      help.autocorrect = "1";
+      init.templatedir = "~/.git_template";
+      merge.ff = "only";
+      rebase = {
+        autosquash = true;
+        autostash = true;
+      };
+      push.default = "upstream";
+      pull = {
+        ff = "only";
+        rebase = true;
+      };
+    };
   };
 
   programs.tmux = {