diff --git a/nvim/init.vim b/nvim/init.vim index 1916983..e1a6982 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -78,35 +78,52 @@ nnoremap fb Telescope buffers nnoremap fh Telescope help_tags " Harpoon -nnoremap a lua require().add_file() +nnoremap a lua require("harpoon.mark").add_file() nnoremap :lua require("harpoon.ui").toggle_quick_menu() -" LspZero : Syntax highlight -lua < :Explore %:h - lsp.on_attach(function(client, bufnr) - -- see :help lsp-zero-keybindings - -- to learn the available actions - lsp.default_keymaps({buffer = bufnr}) - end) - lsp.setup() +lua<'] = cmp.mapping.confirm({select = false}), +lsp.setup() - -- Ctrl+Space to trigger completion menu - [''] = cmp.mapping.complete(), +-- You need to setup `cmp` after lsp-zero +local cmp = require('cmp') +local cmp_action = require('lsp-zero').cmp_action() - -- Navigate between snippet placeholder - [''] = cmp_action.luasnip_jump_forward(), - [''] = cmp_action.luasnip_jump_backward(), - } - }) +cmp.setup({ + mapping = { + -- `Enter` key to confirm completion + [''] = cmp.mapping.confirm({select = false}), + + -- Ctrl+Space to trigger completion menu + [''] = cmp.mapping.complete(), + + -- Navigate between snippet placeholder + [''] = cmp_action.luasnip_jump_forward(), + [''] = cmp_action.luasnip_jump_backward(), + [''] = function(fallback) + if cmp.visible() then + cmp.select_next_item() + else + fallback() + end + end, + [''] = function(fallback) + if cmp.visible() then + cmp.select_prev_item() + else + fallback() + end + end + } +})