diff options
Diffstat (limited to '.config/nvim')
-rw-r--r-- | .config/nvim/lua/plugin_settings.lua | 9 | ||||
-rw-r--r-- | .config/nvim/lua/plugins.lua | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.config/nvim/lua/plugin_settings.lua b/.config/nvim/lua/plugin_settings.lua index 734efd3..a965f6b 100644 --- a/.config/nvim/lua/plugin_settings.lua +++ b/.config/nvim/lua/plugin_settings.lua | |||
@@ -327,7 +327,7 @@ cmp.setup({ | |||
327 | 327 | ||
328 | -- }}} nvim-cmp -- | 328 | -- }}} nvim-cmp -- |
329 | 329 | ||
330 | -- nvim-lsp {{{ -- | 330 | -- nvim-lspconfig {{{ -- |
331 | local nvim_lsp = require('lspconfig') | 331 | local nvim_lsp = require('lspconfig') |
332 | 332 | ||
333 | -- Mappings. | 333 | -- Mappings. |
@@ -360,18 +360,21 @@ local on_attach = function(client, bufnr) | |||
360 | vim.keymap.set('n', '<leader>fm', vim.lsp.buf.formatting, bufopts) | 360 | vim.keymap.set('n', '<leader>fm', vim.lsp.buf.formatting, bufopts) |
361 | end | 361 | end |
362 | 362 | ||
363 | -- bring in cmp_nvim_lsp | ||
364 | local capabilities = require('cmp_nvim_lsp').default_capabilities() | ||
365 | |||
363 | local servers = { 'rust_analyzer', 'jedi_language_server', 'texlab', 'clangd', 'ltex' } | 366 | local servers = { 'rust_analyzer', 'jedi_language_server', 'texlab', 'clangd', 'ltex' } |
364 | for _, lsp in ipairs(servers) do | 367 | for _, lsp in ipairs(servers) do |
365 | nvim_lsp[lsp].setup { | 368 | nvim_lsp[lsp].setup { |
366 | on_attach = on_attach, | 369 | on_attach = on_attach, |
367 | capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) | 370 | capabilities = capabilities |
368 | } | 371 | } |
369 | end | 372 | end |
370 | 373 | ||
371 | nvim_lsp['efm'].setup{ | 374 | nvim_lsp['efm'].setup{ |
372 | on_attach = on_attach, | 375 | on_attach = on_attach, |
373 | filetypes = { 'sh' }, | 376 | filetypes = { 'sh' }, |
374 | capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) | 377 | capabilities = capabilities |
375 | } | 378 | } |
376 | 379 | ||
377 | -- }}} nvim-lsp -- | 380 | -- }}} nvim-lsp -- |
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 2628272..af639e3 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua | |||
@@ -26,8 +26,6 @@ return require('packer').startup(function() | |||
26 | use 'neovim/nvim-lspconfig' | 26 | use 'neovim/nvim-lspconfig' |
27 | 27 | ||
28 | -- annotation generator | 28 | -- annotation generator |
29 | -- learn to use it 2022-05-17 00:44 | ||
30 | -- https://github.com/danymat/neogen | ||
31 | use { | 29 | use { |
32 | "danymat/neogen", | 30 | "danymat/neogen", |
33 | config = function() | 31 | config = function() |