From 353ac7e479ba9fa8fdf390e860217f9530f182f8 Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim@huizinga.dev>
Date: Thu, 29 May 2025 21:39:13 +0200
Subject: [PATCH] Adjusted git keymaps to be easier to use

---
 nvim/dot-config/nvim/lua/autocmds.lua          |  2 +-
 nvim/dot-config/nvim/lua/plugins/comment.lua   | 11 +++++++++--
 nvim/dot-config/nvim/lua/plugins/gitsigns.lua  | 11 +++++++----
 nvim/dot-config/nvim/lua/plugins/which-key.lua |  3 ++-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/nvim/dot-config/nvim/lua/autocmds.lua b/nvim/dot-config/nvim/lua/autocmds.lua
index 2e02da0..9e6d4f0 100644
--- a/nvim/dot-config/nvim/lua/autocmds.lua
+++ b/nvim/dot-config/nvim/lua/autocmds.lua
@@ -69,7 +69,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
 		if client and client:supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then
 			map("<leader>th", function()
 				vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = event.buf }))
-			end, "Toggle inlay hints")
+			end, "Inlay hints")
 		end
 	end,
 })
diff --git a/nvim/dot-config/nvim/lua/plugins/comment.lua b/nvim/dot-config/nvim/lua/plugins/comment.lua
index 66212e1..868b780 100644
--- a/nvim/dot-config/nvim/lua/plugins/comment.lua
+++ b/nvim/dot-config/nvim/lua/plugins/comment.lua
@@ -1,6 +1,13 @@
 -- https://github.com/numToStr/Comment.nvim
 return {
-	'numToStr/Comment.nvim',
+	"numToStr/Comment.nvim",
 	event = "VeryLazy",
-	opts = {},
+	opts = {
+		toggler = {
+			block = "gBc",
+		},
+		opleader = {
+			block = "gB",
+		},
+	},
 }
diff --git a/nvim/dot-config/nvim/lua/plugins/gitsigns.lua b/nvim/dot-config/nvim/lua/plugins/gitsigns.lua
index 84ac4a5..95c8306 100644
--- a/nvim/dot-config/nvim/lua/plugins/gitsigns.lua
+++ b/nvim/dot-config/nvim/lua/plugins/gitsigns.lua
@@ -28,16 +28,19 @@ return {
 	},
 	init = function()
 		local ga = require("gitsigns.actions")
-		vim.keymap.set("n", "<leader>gs", ga.stage_hunk, { desc = "(Un)stage hunk" })
-		vim.keymap.set("v", "<leader>gs", function()
+		vim.keymap.set("n", "gs", ga.stage_hunk, { desc = "(Un)stage hunk" })
+		vim.keymap.set("n", "gS", ga.stage_buffer, { desc = "Stage buffer" })
+		vim.keymap.set("v", "gs", function()
 			ga.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
 		end, { desc = "(Un)stage selection" })
 
-		vim.keymap.set("n", "<leader>gd", ga.preview_hunk, { desc = "Diff hunk" })
+		vim.keymap.set("n", "gd", ga.preview_hunk, { desc = "Diff hunk" })
 
-		vim.keymap.set("n", "<leader>gb", ga.toggle_current_line_blame, { desc = "Blame" })
+		vim.keymap.set("n", "<leader>tb", ga.toggle_current_line_blame, { desc = "Line blame" })
+		vim.keymap.set("n", "gb", ga.blame_line, { desc = "View blame" })
 
 		vim.keymap.set("n", "<leader>gr", ga.reset_hunk, { desc = "Reset hunk" })
+		vim.keymap.set("n", "<leader>gR", ga.reset_buffer, { desc = "Reset buffer" })
 		vim.keymap.set("v", "<leader>gr", function()
 			ga.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
 		end, { desc = "Reset selection" })
diff --git a/nvim/dot-config/nvim/lua/plugins/which-key.lua b/nvim/dot-config/nvim/lua/plugins/which-key.lua
index 25f031c..a659cac 100644
--- a/nvim/dot-config/nvim/lua/plugins/which-key.lua
+++ b/nvim/dot-config/nvim/lua/plugins/which-key.lua
@@ -48,8 +48,9 @@ return {
 		-- TODO: Only make a category show up if there actually are any keybinds under it
 		require("which-key").add({
 			{ "<leader>b", group = "Buffer" },
-			{ "<leader>d", group = "Document" },
+			{ "<leader>d", group = "Doument" },
 			{ "<leader>g", group = "Git" },
+			{ "<leader>t", group = "Toggle" },
 			{ "<leader>s", group = "Search" },
 			{ "gr", group = "LSP" },
 		})