From 966e52643d9b3e39f136f6219fa59d9093a62f50 Mon Sep 17 00:00:00 2001
From: zymon <s@zymon.org>
Date: Wed, 28 Aug 2024 21:40:10 +0200
Subject: [PATCH] git diff stuff + minor keys improvements

---
 lua/znvim/plugins/editor.lua |  3 +++
 lua/znvim/plugins/git.lua    | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lua/znvim/plugins/editor.lua b/lua/znvim/plugins/editor.lua
index e569065..d45699f 100644
--- a/lua/znvim/plugins/editor.lua
+++ b/lua/znvim/plugins/editor.lua
@@ -155,6 +155,9 @@ return {
             spec = {
                 { "<leader>b",  group = "buffer" },
                 { "<leader>g",  group = "git" },
+                { "<leader>gr", group = "reset" },
+                { "<leader>gs", group = "stage" },
+                { "<leader>gt", group = "toggle" },
                 { "<leader>t",  group = "telescope" },
                 { "<leader>u",  group = "ui" },
             },
diff --git a/lua/znvim/plugins/git.lua b/lua/znvim/plugins/git.lua
index 409c60a..86a2995 100644
--- a/lua/znvim/plugins/git.lua
+++ b/lua/znvim/plugins/git.lua
@@ -34,7 +34,7 @@ return {
                 map("n", "<leader>gB", function() gitsigns.blame_line({ full = true }) end, "full blame!")
                 map("n", "<leader>gp", gitsigns.preview_hunk, "look at hunk")
                 map("n", "<leader>gS", ":Gitsigns select_hunk<CR>", "select hunk")
-                map("n", "<leader>gd", gitsigns.diffthis, "diff this")
+                map("n", "<leader>gdd", gitsigns.diffthis, "diff this")
 
                 map("n", "<leader>gsb", gitsigns.stage_buffer, "stage buffer")
                 map("n", "<leader>gsh", ":Gitsigns stage_hunk<CR>", "stage hunk (toggle)")
@@ -58,6 +58,15 @@ return {
             end,
         },
     },
+    { -- diffview
+        "https://github.com/sindrets/diffview.nvim",
+        event = "BufReadPre",
+        keys = {
+            { "<leader>gdo", "<CMD>DiffviewOpen<CR>", desc = "open diffview", },
+            { "<leader>gdc", "<CMD>DiffviewClose<CR>", desc = "close diffview", },
+        }
+    },
+
     { -- neogit
         "https://github.com/NeogitOrg/neogit",
         event = "BufReadPre",
@@ -66,6 +75,9 @@ return {
             "https://github.com/sindrets/diffview.nvim",
             "https://github.com/nvim-telescope/telescope.nvim",
         },
+        keys = {
+            { "<leader>gn", "<CMD>Neogit<CR>", desc = "Neogit", },
+        },
         config = true
     },
     { -- git-worktree