diff --git a/init.lua b/init.lua index 0a3cd78..f5288c3 100644 --- a/init.lua +++ b/init.lua @@ -191,29 +191,29 @@ lsp_zero.on_attach(function(client, bufnr) }) end) -local lspconfig = require('lspconfig') -lspconfig.lua_ls.setup({}) -lspconfig.bashls.setup({}) -lspconfig.clangd.setup({}) -lspconfig.gopls.setup({}) -lspconfig.jdtls.setup({}) -lspconfig.eslint.setup({}) -lspconfig.ts_ls.setup({ +--local lspconfig = vim.lsp.config() +vim.lsp.enable("lua_ls") +vim.lsp.enable("bashls") +vim.lsp.enable("clangd") +vim.lsp.enable("gopls") +vim.lsp.enable("jdtls") +vim.lsp.enable("eslint") +vim.lsp.enable("ts_ls", { settings = { implicitProjectConfiguration = { checkJs = true }, } }) -lspconfig.jedi_language_server.setup({}) -lspconfig.nixd.setup({}) -lspconfig.nginx_language_server.setup({}) -lspconfig.docker_compose_language_service.setup({}) -lspconfig.ansiblels.setup({}) -lspconfig.sourcekit.setup({ +vim.lsp.enable("jedi_language_server") +vim.lsp.enable("nixd") +vim.lsp.enable("nginx_language_server") +vim.lsp.enable("docker_compose_language_service") +vim.lsp.enable("ansiblels") +vim.lsp.enable("sourcekit", { filetypes = { "swift" }, }) --- lspconfig.yamlls.setup({ +-- vim.lsp.enable("yamlls", { -- settings = { -- yaml = { -- schemas = { @@ -224,7 +224,7 @@ lspconfig.sourcekit.setup({ -- }, -- } -- }) -lspconfig.emmet_language_server.setup({ +vim.lsp.enable("emmet_language_server" ,{ filetypes = { "css", "eruby", "html", "javascript", "javascriptreact", "less", "sass", "scss", "pug", "typescriptreact" }, -- Read more about this options in the [vscode docs](https://code.visualstudio.com/docs/editor/emmet#_emmet-configuration). -- **Note:** only the options listed in the table are supported. @@ -252,12 +252,12 @@ lspconfig.emmet_language_server.setup({ --Enable (broadcasting) snippet capability for completion local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true -lspconfig.cssls.setup { +vim.lsp.enable("cssls", { capabilities = capabilities, -} -lspconfig.jsonls.setup { +}) +vim.lsp.enable("jsonls", { capabilities = capabilities, -} +}) -- LSP Inline diagnostics require('tiny-inline-diagnostic').setup() diff --git a/lazy-lock.json b/lazy-lock.json index bad5a50..04170f7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, + "LuaSnip": { "branch": "master", "commit": "787dee55ca364cc9119787165418fe93b74c1842" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cord.nvim": { "branch": "master", "commit": "1af0ff6826b10f9ae8b01c63d16a90b8b31e7c48" }, "dashboard-nvim": { "branch": "master", "commit": "0775e567b6c0be96d01a61795f7b64c1758262f6" }, @@ -11,15 +11,15 @@ "mini.statusline": { "branch": "main", "commit": "14919901649d20d020e659c63c03baa75cd94f33" }, "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-cmp": { "branch": "main", "commit": "d78fb3b64eedb701c9939f97361c06483af575e0" }, + "nvim-cmp": { "branch": "main", "commit": "62b4ee61bec7ece12a4ac0c7acc325ca118a886f" }, "nvim-dap": { "branch": "master", "commit": "b38f7d30366d9169d0a623c4c85fbcf99d8d58bb" }, - "nvim-lspconfig": { "branch": "master", "commit": "c6f05c0900144f027a8a0332566878e398d457b5" }, + "nvim-lspconfig": { "branch": "master", "commit": "abf6d190f2c06818489c0bd4b926e7e3a06c5e51" }, "nvim-tree.lua": { "branch": "master", "commit": "1eda2569394f866360e61f590f1796877388cb8a" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "snacks.nvim": { "branch": "main", "commit": "3c5c23ba91e608bd89bb36d76cb005aa63d20dbf" }, + "snacks.nvim": { "branch": "main", "commit": "836e07336ba523d4da480cd66f0241815393e98e" }, "telescope.nvim": { "branch": "master", "commit": "3a12a853ebf21ec1cce9a92290e3013f8ae75f02" }, "tiny-inline-diagnostic.nvim": { "branch": "main", "commit": "71f998696a4d63a1fa42a6c70d5931a2001e485b" }, "vim-jsdoc": { "branch": "master", "commit": "6e5bc2a1f98a69e4902081c9f5969b228a7a5fd6" },