From cf023aca5254c51dfb241aeee10aa4396d3ebaeb Mon Sep 17 00:00:00 2001 From: Aram Markarov Date: Tue, 17 Mar 2026 03:24:37 +0100 Subject: [PATCH] updated lspconfig --- lua/config/lspconfig.lua | 37 +++++++++++-------------------------- lua/config/treesitter.lua | 3 +-- lua/plugins/init.lua | 1 - 3 files changed, 12 insertions(+), 29 deletions(-) diff --git a/lua/config/lspconfig.lua b/lua/config/lspconfig.lua index a0c9e70..eac7d8c 100644 --- a/lua/config/lspconfig.lua +++ b/lua/config/lspconfig.lua @@ -3,13 +3,8 @@ local mason_lspconfig = require("mason-lspconfig") local lspconfig = require("lspconfig") local cmp_cap = require("config.cmp").capabilities local newlspconfig = vim.lsp.config - local lspenable = vim.lsp.enable -newlspconfig("qmlls", { - cmd = { "qmlls" }, -}) - lspenable("") mason.setup() @@ -17,7 +12,7 @@ mason.setup() mason_lspconfig.setup({ ensure_installed = { "rust_analyzer", "jdtls", "yamlls", "ts_ls", "tailwindcss", "html", - "cssls" + "cssls", "bashls", "postgres_lsp", "pyright", "vimls" }, handlers = { function(server_name) @@ -42,26 +37,16 @@ mason_lspconfig.setup({ } }) -require'lspconfig'.lua_ls.setup({ - capabilities = cmp_cap, - settings = { - Lua = { - runtime = {version = "LuaJIT"}, - diagnostics = { - globals = { - "vim", "bit", "it", "describe", "before_each", "after_each" - } - }, - workspace = { - checkThirdParty = false, - library = {vim.env.VIMRUNTIME} - }, - telemetry = {enable = false} - } - } -}) - -require'lspconfig'.nil_ls.setup{} +vim.lsp.enable('lua_ls') +vim.lsp.enable('qmlls') +vim.lsp.enable('nil_ls') +vim.lsp.enable('arduino-langauge-server') +vim.lsp.enable('cmake') +vim.lsp.enable('clangd') +vim.lsp.enable('hyprls') +vim.lsp.enable('nginx_language_server') +vim.lsp.enable('docker_compose_language_service') +vim.lsp.enable('dockerls') vim.diagnostic.config({ virtual_text = true, diff --git a/lua/config/treesitter.lua b/lua/config/treesitter.lua index cd70c85..5c934e3 100644 --- a/lua/config/treesitter.lua +++ b/lua/config/treesitter.lua @@ -1,9 +1,8 @@ -require'nvim-treesitter.configs'.setup { +require'nvim-treesitter.config'.setup { ensure_installed = "all", sync_install = true, auto_install = true, highlight = {enable = true, additional_vim_regex_highlighting = false}, indent = {enable = true, disable = {}}, - ensure_installed = {"toml", "json", "yaml", "css", "html", "lua"}, autotag = {enable = true} } diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index c63df27..b56437b 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,7 +1,6 @@ return { { "vimpostor/vim-tpipeline", - -- config = function () require("tpipeline") end }, { "aznhe21/actions-preview.nvim", config = function() require("actions-preview") end