From 13fafde824e362d793fd9c4837324a88c43a31d1 Mon Sep 17 00:00:00 2001
From: Simon Lasbrugnas <simon.lasbrugnas@gmail.com>
Date: Mon, 19 Jan 2026 18:04:23 +0100
Subject: [PATCH] feat: add git diff keymaps

---
 lua/config/keymaps.lua    | 15 ++++++++-------
 lua/custom/plugins/go.lua |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index c9b2cc9..1980432 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -46,11 +46,12 @@ set("n", "<leader>dl", "mzyyp`zj")
 -- Start merge conflict resolution
 set("n", "<leader>gm", ":Git mergetool<CR>:only<CR>")
 
--- Diff get local
-set("n", "<leader>dgl", "/\\V======<CR>d<CR>dd/\\V>>>>>><CR>dd")
+-- Toggle vimdiff for side-by-side comparison
+set("n", "<leader>dd", ":if &diff | diffoff | only | else | Gvdiffsplit! | endif<CR>")
 
--- Diff get remote
-set("n", "<leader>dgr", "V/\\V======<CR>d<CR>dd/\\V>>>>>><CR>dd")
-
--- Diff get both
-set("n", "<leader>dgb", "dd/\\V======<CR>dd/\\V>>>>>><CR>dd")
+-- Git conflict resolution (choose local/remote/both)
+set("n", "<leader>dl", 'j?HEAD<CR>"_dd/\\V======<CR>V/\\V>>>>>><CR>"_dk')
+set("n", "<leader>dc", 'j?HEAD<CR>"_dd/\\V======<CR>V/\\V>>>>>><CR>"_dk')
+set("n", "<leader>dr", 'j?HEAD<CR>V/\\V======<CR>"_d/\\V>>>>>><CR>"_ddk')
+set("n", "<leader>di", 'j?HEAD<CR>V/\\V======<CR>"_d/\\V>>>>>><CR>"_ddk')
+set("n", "<leader>db", 'j?HEAD<CR>"_dd/\\V======<CR>"_dd/\\V>>>>>><CR>"_dd2k')
diff --git a/lua/custom/plugins/go.lua b/lua/custom/plugins/go.lua
index 54417f9..85e5959 100644
--- a/lua/custom/plugins/go.lua
+++ b/lua/custom/plugins/go.lua
@@ -3,8 +3,8 @@ return {
 	event = "VeryLazy",
 	opts = {},
 	keys = {
-		{ "<leader>goa", "<cmd>GoAddTag<CR>", desc = "Add struct tags"},
-		{ "<leader>gor", "<cmd>GoRmTag<CR>", desc = "Remove struct tags"},
-		{ "<leader>got", "<cmd>GoAddAllTest<CR>", desc = "Add all tests"},
+		-- { "<leader>goa", "<cmd>GoAddTag<CR>", desc = "Add struct tags"},
+		-- { "<leader>gor", "<cmd>GoRmTag<CR>", desc = "Remove struct tags"},
+		-- { "<leader>got", "<cmd>GoAddAllTest<CR>", desc = "Add all tests"},
 	},
 }