✨ feat(nvim): neogit overhaul and diffview integration

.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 = {

.config/nvim/lua/plugins/extras/editor/git/neogit.lua

@@ -1,13 +1,24 @@
+local prefix = "<leader>gn"
+
 return {
-  "NeogitOrg/neogit",
+  {
-  dependencies = {
+    "NeogitOrg/neogit",
-    "nvim-lua/plenary.nvim",
+    cmd = "Neogit",
-    { "sindrets/diffview.nvim", optional = true },
+    opts = {},
-    "nvim-telescope/telescope.nvim",
+    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 = {},
+    "folke/which-key.nvim",
-  keys = {
+    opts = {
-    { "<leader>gn", "<cmd>Neogit<cr>", desc = "Neogit" },
+      spec = {
+        { prefix, group = "neogit", icon = " " },
+      },
+    },
   },
 }