diff options
| -rw-r--r-- | lua/lazy-plugins.lua | 50 | ||||
| -rw-r--r-- | lua/lsp-setup.lua | 9 | ||||
| -rw-r--r-- | lua/telescope-setup.lua | 8 |
3 files changed, 59 insertions, 8 deletions
diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index ef80010..339e72a 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -64,11 +64,16 @@ require('lazy').setup({ changedelete = { text = '~' }, }, on_attach = function(bufnr) - vim.keymap.set('n', '<leader>hp', require('gitsigns').preview_hunk, { buffer = bufnr, desc = 'Preview git hunk' }) - - -- don't override the built-in and fugitive keymaps local gs = package.loaded.gitsigns - vim.keymap.set({ 'n', 'v' }, ']c', function() + + local function map(mode, l, r, opts) + opts = opts or {} + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) + end + + -- Navigation + map({ 'n', 'v' }, ']c', function() if vim.wo.diff then return ']c' end @@ -76,8 +81,9 @@ require('lazy').setup({ gs.next_hunk() end) return '<Ignore>' - end, { expr = true, buffer = bufnr, desc = 'Jump to next hunk' }) - vim.keymap.set({ 'n', 'v' }, '[c', function() + end, { expr = true, desc = 'Jump to next hunk' }) + + map({ 'n', 'v' }, '[c', function() if vim.wo.diff then return '[c' end @@ -85,7 +91,37 @@ require('lazy').setup({ gs.prev_hunk() end) return '<Ignore>' - end, { expr = true, buffer = bufnr, desc = 'Jump to previous hunk' }) + end, { expr = true, desc = 'Jump to previous hunk' }) + + -- Actions + -- visual mode + map('v', '<leader>hs', function() + gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'stage git hunk' }) + map('v', '<leader>hr', function() + gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } + end, { desc = 'reset git hunk' }) + -- normal mode + map('n', '<leader>hs', gs.stage_hunk, { desc = 'git stage hunk' }) + map('n', '<leader>hr', gs.reset_hunk, { desc = 'git reset hunk' }) + map('n', '<leader>hS', gs.stage_buffer, { desc = 'git Stage buffer' }) + map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'undo stage hunk' }) + map('n', '<leader>hR', gs.reset_buffer, { desc = 'git Reset buffer' }) + map('n', '<leader>hp', gs.preview_hunk, { desc = 'preview git hunk' }) + map('n', '<leader>hb', function() + gs.blame_line { full = false } + end, { desc = 'git blame line' }) + map('n', '<leader>hd', gs.diffthis, { desc = 'git diff against index' }) + map('n', '<leader>hD', function() + gs.diffthis '~' + end, { desc = 'git diff against last commit' }) + + -- Toggles + map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'toggle git blame line' }) + map('n', '<leader>td', gs.toggle_deleted, { desc = 'toggle git show deleted' }) + + -- Text object + map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select git hunk' }) end, }, }, diff --git a/lua/lsp-setup.lua b/lua/lsp-setup.lua index 53fef5a..2675a81 100644 --- a/lua/lsp-setup.lua +++ b/lua/lsp-setup.lua @@ -48,11 +48,18 @@ require('which-key').register { ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' }, ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' }, - ['<leader>h'] = { name = 'More git', _ = 'which_key_ignore' }, + ['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' }, ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' }, ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' }, + ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' }, ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, } +-- register which-key VISUAL mode +-- required for visual <leader>hs (hunk stage) to work +require('which-key').register({ + ['<leader>'] = { name = 'VISUAL <leader>' }, + ['<leader>h'] = { 'Git [H]unk' }, +}, { mode = 'v' }) -- mason-lspconfig requires that these setup functions are called in this order -- before setting up the servers. diff --git a/lua/telescope-setup.lua b/lua/telescope-setup.lua index 3a4e162..cfb5a56 100644 --- a/lua/telescope-setup.lua +++ b/lua/telescope-setup.lua @@ -61,6 +61,14 @@ vim.keymap.set('n', '<leader>/', function() }) end, { desc = '[/] Fuzzily search in current buffer' }) +local function telescope_live_grep_open_files() + require('telescope.builtin').live_grep { + grep_open_files = true, + prompt_title = 'Live Grep in Open Files', + } +end +vim.keymap.set('n', '<leader>s/', telescope_live_grep_open_files, { desc = '[S]earch [/] in Open Files' }) +vim.keymap.set('n', '<leader>ss', require('telescope.builtin').builtin, { desc = '[S]earch [S]elect Telescope' }) vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' }) vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' }) |