From b4ca3831b0b753a7bd6ffafac80b6727fb24bd75 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Thu, 14 Mar 2024 01:41:40 +0000
Subject: [PATCH] Update gitsigns keymaps

---
 CHANGELOG.md              |  4 ++++
 after/plugin/gitsigns.lua | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 205f3a9..9c7cb91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 * Add `committia.vim` to improve the commit buffer when running `git commit`.
 
+### Changed
+
+* Update `gitsigns` keymaps to use `g` as the prefix for keymaps instead of `h` - e.g. `gb` to `git blame` the current line.
+
 ## 12th March 2024
 
 ### Added
diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua
index 8f0570e..44fd8a4 100644
--- a/after/plugin/gitsigns.lua
+++ b/after/plugin/gitsigns.lua
@@ -8,8 +8,6 @@ gitsigns.setup {
   numhl = true,
 }
 
-local bufnr = vim.api.nvim_get_current_buf()
-
 local map = require("opdavies.keymap").map
 local nmap = require("opdavies.keymap").nmap
 local vmap = require("opdavies.keymap").vmap
@@ -17,20 +15,22 @@ local vmap = require("opdavies.keymap").vmap
 nmap { "[h", "<cmd>Gitsigns prev_hunk<CR>" }
 nmap { "]h", "<cmd>Gitsigns next_hunk<CR>" }
 
-nmap { "<leader>hR", gitsigns.reset_buffer }
-nmap { "<leader>hS", gitsigns.stage_buffer }
-nmap { "<leader>hp", gitsigns.preview_hunk }
-nmap { "<leader>hr", gitsigns.reset_hunk }
-nmap { "<leader>hs", gitsigns.stage_hunk }
-nmap { "<leader>hu", gitsigns.undo_stage_hunk }
+nmap { "<leader>gR", gitsigns.reset_buffer }
+nmap { "<leader>gS", gitsigns.stage_buffer }
+nmap { "<leader>gb", gitsigns.blame_line }
+nmap { "<leader>gp", gitsigns.preview_hunk }
+nmap { "<leader>gr", gitsigns.reset_hunk }
+nmap { "<leader>gs", gitsigns.stage_hunk }
+nmap { "<leader>gu", gitsigns.undo_stage_hunk }
+
 vmap {
-  "<leader>hr",
+  "<leader>gr",
   function()
     gitsigns.reset_hunk { vim.fn.line ".", vim.fn.line "v" }
   end,
 }
 vmap {
-  "<leader>hs",
+  "<leader>gs",
   function()
     gitsigns.stage_hunk { vim.fn.line ".", vim.fn.line "v" }
   end,