From 939bc6b64c88ac16f882c09169dd3e63c585c99e Mon Sep 17 00:00:00 2001
From: cy <hi@cything.io>
Date: Wed, 1 Jan 2025 04:28:11 -0500
Subject: [PATCH] new git config

---
 home/yt/common.nix | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/home/yt/common.nix b/home/yt/common.nix
index bf780c3..bd9995e 100644
--- a/home/yt/common.nix
+++ b/home/yt/common.nix
@@ -32,11 +32,31 @@
     enable = true;
     userName = "cy";
     userEmail = "hi@cything.io";
-    delta.enable = true;
+    delta = {
+      enable = true;
+      options = {
+        navigate = true;
+      };
+    };
     extraConfig = {
       init.defaultBranch = "main";
       push.autoSetupRemote = true; # assume -u on first push
-      pull.ff = "only";
+      pull = {
+        rebase = true;
+        autostash = true;
+      };
+      merge.tool = "vimdiff";
+      rebase = {
+        stat = true;
+        autoStash = true;
+        autoSquash = true;
+        updateRefs = true;
+      };
+      help.autocorrect = 1;
+      mergetool = {
+        prompt = false;
+        path = "nvim-open";
+      };
     };
   };
   programs.ripgrep.enable = true;