add git source control integration with gitsigns and diffview

Adds gitsigns.nvim for inline git signs and hunk operations,
diffview.nvim for side-by-side diffs, and Telescope git pickers
under the <leader>g namespace.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Nicholai Vogel 2026-01-17 22:38:01 -07:00
parent 5011905109
commit 6e8006d935
3 changed files with 50 additions and 0 deletions

View File

@ -6,7 +6,9 @@
"cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "235dd79731c1dc51ec04abb4045cbc54727a172a" }, "conform.nvim": { "branch": "master", "commit": "235dd79731c1dc51ec04abb4045cbc54727a172a" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
"gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" },
"kanagawa": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "kanagawa": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" },
"lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" },
"lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },

View File

@ -9,6 +9,12 @@ keymap('n', '<leader>ff', '<cmd>Telescope find_files<cr>', { desc = "Find files"
keymap('n', '<leader>fg', '<cmd>Telescope live_grep<cr>', { desc = "Live grep" }) keymap('n', '<leader>fg', '<cmd>Telescope live_grep<cr>', { desc = "Live grep" })
keymap('n', '<leader>fb', '<cmd>Telescope buffers<cr>', { desc = "Find buffers" }) keymap('n', '<leader>fb', '<cmd>Telescope buffers<cr>', { desc = "Find buffers" })
-- Git (Telescope pickers)
keymap('n', '<leader>gt', '<cmd>Telescope git_status<cr>', { desc = "Git status" })
keymap('n', '<leader>gc', '<cmd>Telescope git_commits<cr>', { desc = "Git commits" })
keymap('n', '<leader>gf', '<cmd>Telescope git_bcommits<cr>', { desc = "File commits" })
keymap('n', '<leader>gw', '<cmd>Telescope git_branches<cr>', { desc = "Git branches" })
-- Better window navigation -- Better window navigation
keymap('n', '<C-h>', '<C-w>h') keymap('n', '<C-h>', '<C-w>h')
keymap('n', '<C-j>', '<C-w>j') keymap('n', '<C-j>', '<C-w>j')

View File

@ -42,6 +42,47 @@ return {
end, end,
}, },
-- Git signs
{
"lewis6991/gitsigns.nvim",
event = { "BufReadPre", "BufNewFile" },
config = function()
require("gitsigns").setup({
on_attach = function(bufnr)
local gs = package.loaded.gitsigns
local map = function(mode, l, r, opts)
opts = opts or {}
opts.buffer = bufnr
vim.keymap.set(mode, l, r, opts)
end
-- Navigation
map("n", "]c", function() gs.next_hunk() end, { desc = "Next hunk" })
map("n", "[c", function() gs.prev_hunk() end, { desc = "Previous hunk" })
-- Actions
map("n", "<leader>gs", gs.stage_hunk, { desc = "Stage hunk" })
map("n", "<leader>gr", gs.reset_hunk, { desc = "Reset hunk" })
map("n", "<leader>gS", gs.stage_buffer, { desc = "Stage buffer" })
map("n", "<leader>gu", gs.undo_stage_hunk, { desc = "Undo stage" })
map("n", "<leader>gp", gs.preview_hunk, { desc = "Preview hunk" })
map("n", "<leader>gb", function() gs.blame_line({ full = true }) end, { desc = "Blame line" })
map("n", "<leader>gd", gs.diffthis, { desc = "Diff this" })
end,
})
end,
},
-- Diff view
{
"sindrets/diffview.nvim",
cmd = { "DiffviewOpen", "DiffviewFileHistory" },
keys = {
{ "<leader>gv", "<cmd>DiffviewOpen<cr>", desc = "Diff view" },
{ "<leader>gh", "<cmd>DiffviewFileHistory %<cr>", desc = "File history" },
{ "<leader>gx", "<cmd>DiffviewClose<cr>", desc = "Close diff" },
},
config = true,
},
-- Fuzzy finder -- Fuzzy finder
{ {
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
@ -190,6 +231,7 @@ return {
{ "<leader>ff", desc = "Find files" }, { "<leader>ff", desc = "Find files" },
{ "<leader>fg", desc = "Live grep" }, { "<leader>fg", desc = "Live grep" },
{ "<leader>fb", desc = "Find buffers" }, { "<leader>fb", desc = "Find buffers" },
{ "<leader>g", group = "Git" },
{ "<leader>w", desc = "Save" }, { "<leader>w", desc = "Save" },
{ "<leader>q", desc = "Quit" }, { "<leader>q", desc = "Quit" },
}) })