From 1e07349e420053490f7a8abf7c312c7ee0a38d54 Mon Sep 17 00:00:00 2001
From: Oliver Ladner <waste@lugh.ch>
Date: Thu, 8 Jan 2026 11:49:03 +0100
Subject: [PATCH] fix: add hunk mgmt remaps, gather Git rempaps at one place

---
 lua/weeheavy/remap.lua | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lua/weeheavy/remap.lua b/lua/weeheavy/remap.lua
index 44337d6..15f1f58 100644
--- a/lua/weeheavy/remap.lua
+++ b/lua/weeheavy/remap.lua
@@ -35,6 +35,7 @@ vim.keymap.set(
 -- NOTE: this one is a bit hard to migrate away from Telescope to mini.nvim
 vim.keymap.set("n", "<leader>ft", ":TodoTelescope<CR>", { noremap = true, desc = "Find TODOs" })
 
+-- Git things
 vim.keymap.set("n", "<leader>gla", ":Pick git_commits<CR>", { noremap = true, desc = "Git log (all files)" })
 vim.keymap.set("n", "<leader>glf", ":Pick git_commits path='%'<CR>", { noremap = true, desc = "Git log (this file)" })
 vim.keymap.set("n", "<leader>gd", function()
@@ -45,6 +46,11 @@ vim.keymap.set("n", "<leader>gd", function()
     end
 end, { noremap = true, desc = "Git diff/stage" })
 vim.keymap.set("n", "<leader>gb", ":Gitsigns toggle_current_line_blame<CR>", { noremap = true, desc = "Git blame" })
+vim.keymap.set("n", "<leader>gg", ":Gitsigns preview_hunk<CR>", { noremap = true, desc = "Preview git hunk" })
+vim.keymap.set("n", "<leader>gs", ":Gitsigns stage_hunk<CR>", { noremap = true, desc = "Stage hunk" })
+vim.keymap.set("n", "<leader>gb", ":Gitsigns blame<CR>", { noremap = true, desc = "Blame" })
+vim.keymap.set("n", "<leader>gp", ":Gitsigns prev_hunk<CR>", { noremap = true, desc = "Previous hunk" })
+vim.keymap.set("n", "<leader>gn", ":Gitsigns next_hunk<CR>", { noremap = true, desc = "Next hunk" })
 
 -- Remapping of existing Vim key binds
 -- vim.keymap.set("n", "w", "W") -- skip punctuation when moving to start of next word
@@ -120,11 +126,3 @@ vim.keymap.set("n", "<leader>p", ":TimerStart 30m<CR>", { desc = "Pomodoro" })
 vim.keymap.set("n", "fc", function()
     require("treesitter-context").go_to_context(vim.v.count1)
 end, { silent = true })
-
-
-
-
--- vim.keymap.set("n", "<leader>gg", require("gitsigns").preview_hunk, { buffer = bufnr, desc = "Preview git hunk" })
-vim.keymap.set("n", "<leader>gg", ":Gitsigns preview_hunk<CR>", { noremap = true, desc = "Preview git hunk" })
-vim.keymap.set("n", "<leader>gs", ":Gitsigns stage_hunk<CR>", { noremap = true, desc = "Stage hunk" })
-vim.keymap.set("n", "<leader>gb", ":Gitsigns blame<CR>", { noremap = true, desc = "Blame" })