saschal/neovim-configuration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keybingings for git and completion

Browse Source 
- <space>=r reset hunk
- <space>=R reset file
- <space>=R reset file
This commit is contained in:
Sascha Lüdecke
2024-10-13 21:21:33 +02:00
parent 98149a4b8f
commit 75e581e856
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lua/config/nvim-cmp.lua
View File

@@ -21,6 +21,8 @@ cmp.setup({
-- Use <C-k/j> to switch in items -- Use <C-k/j> to switch in items
['<C-k>'] = cmp.mapping.select_prev_item(), ['<C-k>'] = cmp.mapping.select_prev_item(),
['<C-j>'] = cmp.mapping.select_next_item(), ['<C-j>'] = cmp.mapping.select_next_item(),
['<C-Space>'] = cmp.mapping.complete(),
-- Use <CR>(Enter) to confirm selection -- Use <CR>(Enter) to confirm selection
-- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
['<CR>'] = cmp.mapping.confirm({ select = true }), ['<CR>'] = cmp.mapping.confirm({ select = true }),

4
lua/lsp.lua
View File

@@ -58,7 +58,9 @@ local on_attach = function(client, bufnr)
vim.keymap.set('n', '<space>=]', gitsigns.next_hunk, { desc = "Git next hunk" }) vim.keymap.set('n', '<space>=]', gitsigns.next_hunk, { desc = "Git next hunk" })
vim.keymap.set('n', '<space>=d', gitsigns.diffthis, { desc = "Git diff this" }) vim.keymap.set('n', '<space>=d', gitsigns.diffthis, { desc = "Git diff this" })
vim.keymap.set('n', '<space>=D', function() gitsigns.diffthis('~') end, { desc = "Git diff this (~)" }) vim.keymap.set('n', '<space>=D', function() gitsigns.diffthis('~') end, { desc = "Git diff this (~)" })
vim.keymap.set('n', '<space>=s', gitsigns.stage_hunk, { desc = "Git stage hunk" }) vim.keymap.set('n', '<space>=r', gitsigns.reset_hunk, { desc = "Git reset hunk" })
vim.keymap.set('n', '<space>=R', gitsigns.reset_buffer, { desc = "Git reset file" })
vim.keymap.set('n', '<space>=S', gitsigns.stage_buffer, { desc = "Git stage file" })
vim.keymap.set('n', '<space>=b', gitsigns.blame_line, { desc = "Git blame line" }) vim.keymap.set('n', '<space>=b', gitsigns.blame_line, { desc = "Git blame line" })
vim.keymap.set('n', '<space>=B', gitsigns.blame, { desc = "Git blame file" }) vim.keymap.set('n', '<space>=B', gitsigns.blame, { desc = "Git blame file" })