diff --git a/lua/init.lua b/lua/init.lua index 58efb70..ebec755 100644 --- a/lua/init.lua +++ b/lua/init.lua @@ -34,11 +34,9 @@ local cmp = require("cmp") local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) -require("lspconfig").ts_ls.setup({}) - -require("lspconfig").clangd.setup({}) - -require("lspconfig").gopls.setup({ +vim.lsp.config('ts_ls', {}) +vim.lsp.config('clangd', {}) +vim.lsp.config('gopls', { cmd = { "gopls", "serve" }, settings = { gopls = { @@ -49,11 +47,9 @@ require("lspconfig").gopls.setup({ }, }, }) - -require'lspconfig'.pyright.setup{} - -require("lspconfig").rust_analyzer.setup({ - --cmd = { "rustup", "run", "nightly", "rust-analyzer" }, +vim.lsp.config('pyright', {}) +vim.lsp.config('rust_analyzer', { + cmd = { "rust-analyzer" }, settings = { ['rust-analyzer'] = { checkOnSave = { @@ -66,12 +62,15 @@ require("lspconfig").rust_analyzer.setup({ } } }) - -require('lspconfig').kotlin_language_server.setup({ +vim.lsp.config('kotlin-language-server', { cmd = { "kotlin-language-server" }, filetypes = { "kotlin"} , }) +vim.lsp.config('cmake', {}) +vim.lsp.config('html', {}) +vim.lsp.config('glsl_analyzer', {}) + require'nvim-treesitter.configs'.setup { -- Install parsers synchronously (only applied to `ensure_installed`) sync_install = false, @@ -87,19 +86,21 @@ require'nvim-treesitter.configs'.setup { }, } +vim.lsp.enable({"ts_ls"}) +vim.lsp.enable({"clangd"}) +vim.lsp.enable({"gopls"}) +vim.lsp.enable({"pywright"}) +vim.lsp.enable({"rust_analyzer"}) +vim.lsp.enable({"kotlin-language-server"}) +vim.lsp.enable({"cmake"}) +vim.lsp.enable({"html"}) +vim.lsp.enable({"glsl_analyzer"}) + vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( vim.lsp.diagnostic.on_publish_diagnostics, { update_in_insert = true, } ) -require'lspconfig'.cmake.setup{} - local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true - -require'lspconfig'.html.setup { - capabilities = capabilities, -} - -require'lspconfig'.glsl_analyzer.setup{}