From b6435f0d57c31028267e02f2b527c8a9c0b034f7 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 4 Mar 2022 09:36:05 +0100
Subject: [PATCH] home: vim: centralise 'git'-related mappings

---
 home/vim/after/plugin/mappings/git.vim | 18 ------------------
 home/vim/plugin/settings/gitsigns.vim  |  3 +++
 2 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 home/vim/after/plugin/mappings/git.vim

diff --git a/home/vim/after/plugin/mappings/git.vim b/home/vim/after/plugin/mappings/git.vim
deleted file mode 100644
index bb8b194..0000000
--- a/home/vim/after/plugin/mappings/git.vim
+++ /dev/null
@@ -1,18 +0,0 @@
-lua << EOF
-local wk = require("which-key")
-
-local keys = {
-    d = {
-        name = "Merging diff hunks",
-        o = { "<cmd>diffget<CR>", "Use this buffer's change", mode="x" },
-        p = { "<cmd>diffput<CR>", "Accept other buffer change", mode="x" },
-    },
-    ["<leader>g"] = {
-        name = "Git",
-        l = { "<cmd>:sp<CR><C-w>T:Gllog --follow -- %:p<CR>", "Current buffer log" },
-        m = { "<Plug>(git-messenger)", "Current line blame" },
-    },
-}
-
-wk.register(keys)
-EOF
diff --git a/home/vim/plugin/settings/gitsigns.vim b/home/vim/plugin/settings/gitsigns.vim
index 7804f3e..c8f11a1 100644
--- a/home/vim/plugin/settings/gitsigns.vim
+++ b/home/vim/plugin/settings/gitsigns.vim
@@ -26,7 +26,10 @@ gitsigns.setup({
                 b = { gitsigns.toggle_current_line_blame, "Toggle blame virtual text" },
                 d = { gitsigns.diffthis, "Diff buffer" },
                 D = { function() gitsigns.diffthis("~") end, "Diff buffer against last commit" },
+                g = { "<cmd>Git<CR>", "Git status" },
                 h = { gitsigns.toggle_deleted, "Show deleted hunks" },
+                L = { "<cmd>:sp<CR><C-w>T:Gllog --follow -- %:p<CR>", "Current buffer log" },
+                m = { "<Plug>(git-messenger)", "Current line blame" },
                 p = { gitsigns.preview_hunk, "Preview hunk" },
                 r = { gitsigns.reset_hunk, "Revert hunk" },
                 R = { gitsigns.reset_buffer, "Revert buffer" },