diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 6a8c64d..cf75baf 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -16,18 +16,20 @@ return { "hrsh7th/cmp-nvim-lsp" }, config = function() - require("lsp-zero") vim.opt.signcolumn = 'yes' + local lspconfig_defaults = require('lspconfig').util.default_config lspconfig_defaults.capabilities = vim.tbl_deep_extend( 'force', lspconfig_defaults.capabilities, require('cmp_nvim_lsp').default_capabilities() ) + vim.api.nvim_create_autocmd('LspAttach', { desc = 'LSP actions', callback = function(event) local opts = { buffer = event.buf } + vim.keymap.set('n', 'K', 'lua vim.lsp.buf.hover()', opts) vim.keymap.set('n', 'gd', 'lua vim.lsp.buf.definition()', opts) vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) @@ -40,6 +42,23 @@ return { vim.keymap.set('n', '', 'lua vim.lsp.buf.code_action()', opts) end, }) + + local lspconfig = require('lspconfig') + lspconfig.lua_ls.setup{} + + local cmp = require('cmp') + + cmp.setup({ + sources = { + { name = 'nvim_lsp' }, + }, + snippet = { + expand = function(args) + vim.snippet.expand(args.body) + end, + }, + mapping = cmp.mapping.preset.insert({}), + }) end, } }