From 53cf519d4a7a9d4a32459fe8ebe577a594ceba9f Mon Sep 17 00:00:00 2001
From: Tony Miller <tony@tmiller.me>
Date: Thu, 9 Oct 2025 12:26:39 +1000
Subject: [PATCH] git imrovements

Added lazygit and delta for nice output.
---
 .config/Brewfile   |  2 ++
 .config/git/config | 12 ++++++++++++
 .zshrc             |  1 +
 3 files changed, 15 insertions(+)

diff --git a/.config/Brewfile b/.config/Brewfile
index e443f23..a5de7e1 100644
--- a/.config/Brewfile
+++ b/.config/Brewfile
@@ -29,6 +29,8 @@ brew "yt-dlp"
 brew "fnm"
 brew "go"
 brew "ctpv"
+brew "git-delta"
+brew "lazygit"
 
 cask "alfred"
 cask "kitty"
diff --git a/.config/git/config b/.config/git/config
index b2609f7..8faee5d 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -9,6 +9,15 @@
 [core]
 	excludesFile = ~/.config/git/ignore
 	quotepath = false
+  pager = delta
+
+[interactive]
+  diffFilter = delta --color-only
+
+[delta]
+  naviate = true
+  side-by-side = true
+  line-number = true
 
 [pull]
 	rebase = true
@@ -31,6 +40,9 @@
 	prompt = false
 	trustExitCode = true
 
+[merge]
+  conflictStyle = zdiff3
+
 [mergetool]
 	prompt = false
   conflictstyle = diff3
diff --git a/.zshrc b/.zshrc
index 6029e86..87fb01e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -123,6 +123,7 @@ alias vimdiff="nvim -d"
 alias bb="bbedit"
 alias bw="bbedit --wait --resume"
 alias ls="eza --group-directories-first --header"
+alias lg="lazygit"
 
 alias rm=trash