From 563408978843ee956f8f467f34257a284377c602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergio.lac@pm.me>
Date: Fri, 6 Sep 2024 13:30:55 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(nvim):=20neogit=20overhaul=20a?=
 =?UTF-8?q?nd=20diffview=20integration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugins/extras/editor/git/diffview.lua    | 11 ++++++-
 .../lua/plugins/extras/editor/git/neogit.lua  | 29 +++++++++++++------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/.config/nvim/lua/plugins/extras/editor/git/diffview.lua b/.config/nvim/lua/plugins/extras/editor/git/diffview.lua
index 7f4e10c8..78184002 100644
--- a/.config/nvim/lua/plugins/extras/editor/git/diffview.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git/diffview.lua
@@ -4,7 +4,7 @@ return {
   {
     "sindrets/diffview.nvim",
     keys = {
-      { "<leader>gY", "<cmd>DiffviewFileHistory<CR>", desc = "Repo History (Diff)" },
+      { "<leader>gD", "<cmd>DiffviewFileHistory<CR>", desc = "Diff Repo" },
       { "<leader>gd", "<cmd>DiffviewOpen<CR>", desc = "Diff View" },
     },
     opts = function(_, opts)
@@ -46,6 +46,15 @@ return {
       }
     end,
   },
+  {
+    "NeogitOrg/neogit",
+    optional = true,
+    opts = {
+      integrations = {
+        diffview = true,
+      },
+    },
+  },
   {
     "folke/which-key.nvim",
     opts = {
diff --git a/.config/nvim/lua/plugins/extras/editor/git/neogit.lua b/.config/nvim/lua/plugins/extras/editor/git/neogit.lua
index 217e13f6..67bc60eb 100644
--- a/.config/nvim/lua/plugins/extras/editor/git/neogit.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git/neogit.lua
@@ -1,13 +1,24 @@
+local prefix = "<leader>gn"
+
 return {
-  "NeogitOrg/neogit",
-  dependencies = {
-    "nvim-lua/plenary.nvim",
-    { "sindrets/diffview.nvim", optional = true },
-    "nvim-telescope/telescope.nvim",
+  {
+    "NeogitOrg/neogit",
+    cmd = "Neogit",
+    opts = {},
+    keys = {
+      { prefix .. "n", "<cmd>Neogit<cr>", desc = "Neogit (Root Dir)" },
+      { prefix .. "c", "<cmd>Neogit commit<cr>", desc = "Commit" },
+      { prefix .. "p", "<cmd>Neogit pull<cr>", desc = "Pull" },
+      { prefix .. "P", "<cmd>Neogit push<cr>", desc = "Push" },
+      { prefix .. "f", "<cmd>Neogit fetch<cr>", desc = "Fetch" },
+    },
   },
-  cmd = { "Neogit" },
-  opts = {},
-  keys = {
-    { "<leader>gn", "<cmd>Neogit<cr>", desc = "Neogit" },
+  {
+    "folke/which-key.nvim",
+    opts = {
+      spec = {
+        { prefix, group = "neogit", icon = " " },
+      },
+    },
   },
 }