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 = { - { "gY", "DiffviewFileHistory", desc = "Repo History (Diff)" }, + { "gD", "DiffviewFileHistory", desc = "Diff Repo" }, { "gd", "DiffviewOpen", 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 = "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", "Neogit", desc = "Neogit (Root Dir)" }, + { prefix .. "c", "Neogit commit", desc = "Commit" }, + { prefix .. "p", "Neogit pull", desc = "Pull" }, + { prefix .. "P", "Neogit push", desc = "Push" }, + { prefix .. "f", "Neogit fetch", desc = "Fetch" }, + }, }, - cmd = { "Neogit" }, - opts = {}, - keys = { - { "gn", "Neogit", desc = "Neogit" }, + { + "folke/which-key.nvim", + opts = { + spec = { + { prefix, group = "neogit", icon = " " }, + }, + }, }, }