From 3b18b6c7c037a124f82a446a31ac0ef73897d3f1 Mon Sep 17 00:00:00 2001 From: Job79 Date: Tue, 15 Sep 2026 20:20:00 +0200 Subject: [PATCH] feat: add some more options for git diff --- plugin/20_keymaps.lua | 7 +++++++ plugin/40_plugins.lua | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/plugin/20_keymaps.lua b/plugin/20_keymaps.lua index 8da0c1f..54ffd37 100644 --- a/plugin/20_keymaps.lua +++ b/plugin/20_keymaps.lua @@ -82,7 +82,14 @@ nmap_leader('fS', function() MiniExtra.pickers.lsp({ scope = 'document_symbol' } nmap_leader('f:', function() MiniExtra.pickers.history({ scope = ':' }) end, 'Command history') -- Git +local diff_unstaged = function() + vim.cmd.diffthis() + vim.cmd('vert Git show :./%') + vim.cmd.diffthis() +end + nmap_leader('ga', function() vim.cmd('Git add %') end, 'Add current file') +nmap_leader('gd', diff_unstaged, 'Diff unstaged') nmap_leader('go', function() MiniDiff.toggle_overlay() end, 'Toggle overlay') nmap_leader('gs', function() MiniGit.show_at_cursor() end, 'Show at cursor') xmap_leader('gs', function() MiniGit.show_at_cursor() end, 'Show at selection') diff --git a/plugin/40_plugins.lua b/plugin/40_plugins.lua index abe955c..8a36941 100644 --- a/plugin/40_plugins.lua +++ b/plugin/40_plugins.lua @@ -3,6 +3,10 @@ Config.now(function() vim.pack.add({ { src = 'https://github.com/rose-pine/neovim', name = 'rose-pine' } }) require('rose-pine').setup({ enable = { terminal = false, legacy_highlights = false, migrations = false }, + highlight_groups = { + MiniDiffOverAdd = { fg = 'NONE', bg = 'foam', blend = 20 }, + MiniDiffOverChangeBuf = { bg = 'rose', blend = 20 }, + }, }) vim.cmd.colorscheme('rose-pine')