From a80e9801f8f8958a8c44be5fb74f594d22f18452 Mon Sep 17 00:00:00 2001
From: Amolith <amolith@secluded.site>
Date: Wed, 12 Nov 2025 12:23:13 -0700
Subject: [PATCH] chore(git): replace lazygit with gitui, reorganise

---
 dot_config/git/config.tmpl    | 29 +++++++++++++++--------------
 dot_config/lazygit/config.yml |  6 ------
 2 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 dot_config/lazygit/config.yml

diff --git a/dot_config/git/config.tmpl b/dot_config/git/config.tmpl
index fc09bdea06a4eeefc39369b4691222afd4f9a23f..5a9a512c721df3251b7736a1c06fb862d507ab2d 100644
--- a/dot_config/git/config.tmpl
+++ b/dot_config/git/config.tmpl
@@ -1,27 +1,28 @@
 [init]
 	defaultBranch = main
 [alias]
-	fp = push --force-with-lease
 	l = log
-	d = diff
-	s = show
-	m = !meteor
-	me = merge
-	dl = -c diff.external=difft log -p --ext-diff
-	ds = -c diff.external=difft show --ext-diff
-	df = -c diff.external=difft diff
+	wt = worktree
+	br = branch
+	fp = push --force-with-lease
 	patch = push rad HEAD:refs/patches
-	lazy = !lazygit
-	us = 'reset HEAD --'
-	sg = stage
 	ci = commit
 	co = checkout
-	wt = worktree
 	rb = rebase
-	br = branch
-	st = status
+	rp = request-pull
 	ps = push
 	pl = pull
+	us = 'reset HEAD --'
+	ui = !gitui
+	m = !meteor
+	me = merge
+	s = show
+	st = status
+	sg = stage
+	d = diff
+	dl = -c diff.external=difft log -p --ext-diff
+	ds = -c diff.external=difft show --ext-diff
+	df = -c diff.external=difft diff
 	bugs = bug bug
 	bugs-create = bug bug new
 	bugs-push = !fish -c 'git-bug-push'
diff --git a/dot_config/lazygit/config.yml b/dot_config/lazygit/config.yml
deleted file mode 100644
index 225fc1152a0981755e5e6c8bd8e165f7d6b73a27..0000000000000000000000000000000000000000
--- a/dot_config/lazygit/config.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-git:
-  overrideGpg: true
-  paging:
-    colorArg: always
-    pager: delta --paging=never
-  autoFetch: false