s0wlz (Matthias Puchstein)
19c6591658
- Java DAP: add java-debug-adapter + java-test via mason, populate jdtls bundles with debug/test JARs - neotest: add marilari88/neotest-vitest adapter - git: promote diffview.nvim to first-class plugin with keymaps (<leader>gD diff, <leader>gH file history) - pandoc: replace stub with knap.nvim for live markdown→PDF preview via pandoc + lualatex + zathura (<leader>mp toggle, <leader>mj jump) - remove 17 empty stub files left over from AstroNvim migration
74 lines
2.2 KiB
Lua
74 lines
2.2 KiB
Lua
return {
|
|
-- Gutter signs, hunk navigation, inline blame
|
|
{
|
|
"lewis6991/gitsigns.nvim",
|
|
event = { "BufReadPost", "BufNewFile" },
|
|
opts = {
|
|
signs = {
|
|
add = { text = "▎" },
|
|
change = { text = "▎" },
|
|
delete = { text = "" },
|
|
topdelete = { text = "" },
|
|
changedelete = { text = "▎" },
|
|
untracked = { text = "▎" },
|
|
},
|
|
on_attach = function(bufnr)
|
|
local gs = package.loaded.gitsigns
|
|
local map = function(mode, lhs, rhs, desc)
|
|
vim.keymap.set(mode, lhs, rhs, { buffer = bufnr, desc = desc })
|
|
end
|
|
|
|
-- Navigation
|
|
map("n", "]h", function()
|
|
if vim.wo.diff then return "]h" end
|
|
vim.schedule(function() gs.next_hunk() end)
|
|
return "<Ignore>"
|
|
end, "Next hunk")
|
|
map("n", "[h", function()
|
|
if vim.wo.diff then return "[h" end
|
|
vim.schedule(function() gs.prev_hunk() end)
|
|
return "<Ignore>"
|
|
end, "Prev hunk")
|
|
|
|
-- Actions
|
|
map("n", "<leader>hs", gs.stage_hunk, "Stage hunk")
|
|
map("n", "<leader>gu", gs.undo_stage_hunk, "Undo stage hunk")
|
|
map("n", "<leader>gh", gs.preview_hunk, "Preview hunk")
|
|
map("n", "<leader>hb", gs.toggle_current_line_blame, "Toggle blame")
|
|
map("n", "<leader>gb", gs.toggle_current_line_blame, "Toggle blame")
|
|
map("n", "<leader>gd", gs.diffthis, "Diff this")
|
|
end,
|
|
},
|
|
},
|
|
|
|
-- Split diff view and file history
|
|
{
|
|
"sindrets/diffview.nvim",
|
|
cmd = { "DiffviewOpen", "DiffviewClose", "DiffviewFileHistory" },
|
|
keys = {
|
|
{ "<leader>gD", "<cmd>DiffviewOpen<cr>", desc = "Diff working tree" },
|
|
{ "<leader>gH", "<cmd>DiffviewFileHistory %<cr>", desc = "File history" },
|
|
},
|
|
},
|
|
|
|
-- Magit-style full git interface
|
|
{
|
|
"NeogitOrg/neogit",
|
|
dependencies = {
|
|
"nvim-lua/plenary.nvim",
|
|
"sindrets/diffview.nvim",
|
|
"nvim-telescope/telescope.nvim",
|
|
},
|
|
cmd = "Neogit",
|
|
keys = {
|
|
{ "<leader>gg", "<cmd>Neogit<cr>", desc = "Neogit" },
|
|
},
|
|
opts = {
|
|
integrations = {
|
|
telescope = true,
|
|
diffview = true,
|
|
},
|
|
},
|
|
},
|
|
}
|