aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugin-settings/lspconfig.lua6
-rw-r--r--plugins.vim2
2 files changed, 3 insertions, 5 deletions
diff --git a/plugin-settings/lspconfig.lua b/plugin-settings/lspconfig.lua
index 150db34..b866cbb 100644
--- a/plugin-settings/lspconfig.lua
+++ b/plugin-settings/lspconfig.lua
@@ -1,5 +1,3 @@
-local lspconfig = require("lspconfig")
-
-- Mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
local opts = { noremap = true, silent = true }
@@ -52,10 +50,10 @@ local simple_servers = {
"yamlls",
}
for _, lsp in ipairs(simple_servers) do
- lspconfig[lsp].setup({ capabilities = capabilities, on_attach = on_attach })
+ vim.lsp.config(lsp, { capabilities = capabilities, on_attach = on_attach })
end
-require("lspconfig").lua_ls.setup({
+vim.lsp.config("lua_ls", {
on_init = function(client)
if client.workspace_folders then
local path = client.workspace_folders[1].name
diff --git a/plugins.vim b/plugins.vim
index 1ffb143..fcc38a8 100644
--- a/plugins.vim
+++ b/plugins.vim
@@ -20,7 +20,7 @@ Plug 'https://github.com/lukas-reineke/indent-blankline.nvim' " Indent guides fo
Plug 'https://gitlab.com/HiPhish/rainbow-delimiters.nvim' " Rainbow delimiters for Neovim with Tree-sitter.
Plug 'https://github.com/nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " Nvim Treesitter configurations and abstraction layer.
Plug 'https://github.com/nvim-treesitter/nvim-treesitter-context' " Show code context.
-Plug 'https://github.com/jose-elias-alvarez/null-ls.nvim' " Use Neovim as a language server to inject LSP diagnostics, code actions, and more via Lua.
+Plug 'https://github.com/nvimtools/none-ls.nvim' " Use Neovim as a language server to inject LSP diagnostics, code actions, and more via Lua.
Plug 'https://github.com/Vimjas/vim-python-pep8-indent' " A nicer Python indentation style for vim.
Plug 'https://github.com/vim-airline/vim-airline' " Lean & mean status/tabline for vim that's light as air.
Plug 'https://github.com/vim-airline/vim-airline-themes' " A collection of themes for vim-airline.