diff --git a/common/.config/nvim/lsp/bashls.lua b/common/.config/nvim/lsp/bashls.lua index f068a52..dcc6a22 100644 --- a/common/.config/nvim/lsp/bashls.lua +++ b/common/.config/nvim/lsp/bashls.lua @@ -1,3 +1,4 @@ return { + cmd = { "bash-language-server", "start" }, filetypes = { "sh", "bash", "zsh" }, } diff --git a/common/.config/nvim/lsp/cssls.lua b/common/.config/nvim/lsp/cssls.lua index a564707..9886d15 100644 --- a/common/.config/nvim/lsp/cssls.lua +++ b/common/.config/nvim/lsp/cssls.lua @@ -1 +1,9 @@ -return {} +return { + cmd = { "vscode-css-language-server", "--studio" }, + filetypes = { "css", "scss", "less" }, + settings = { + css = { validate = true }, + scss = { validate = true }, + less = { validate = true }, + }, +} diff --git a/common/.config/nvim/lsp/docker_compose_language_service.lua b/common/.config/nvim/lsp/docker_compose_language_service.lua index a564707..f109b2f 100644 --- a/common/.config/nvim/lsp/docker_compose_language_service.lua +++ b/common/.config/nvim/lsp/docker_compose_language_service.lua @@ -1 +1,4 @@ -return {} +return { + cmd = { "docker-compose-langserver", "--stdio" }, + filetypes = { "yaml.docker-compose" }, +} diff --git a/common/.config/nvim/lsp/dockerls.lua b/common/.config/nvim/lsp/dockerls.lua index a564707..35ab8d7 100644 --- a/common/.config/nvim/lsp/dockerls.lua +++ b/common/.config/nvim/lsp/dockerls.lua @@ -1 +1,4 @@ -return {} +return { + cmd = { "docker-langserver", "--stdio" }, + filetypes = { "dockerfile" }, +} diff --git a/common/.config/nvim/lsp/html.lua b/common/.config/nvim/lsp/html.lua index ebcaaa4..54a4b75 100644 --- a/common/.config/nvim/lsp/html.lua +++ b/common/.config/nvim/lsp/html.lua @@ -1,6 +1,9 @@ return { - -- cmd = { ... }, - -- filetypes = { ... }, - -- capabilities = {}, + cmd = { "vscode-html-language-server", "--stdio" }, filetypes = { "html", "twig", "hbs" }, + settings = { + html = { + format = { wrapLineLength = 120 }, + }, + }, } diff --git a/common/.config/nvim/lsp/jsonls.lua b/common/.config/nvim/lsp/jsonls.lua index e2e69ef..6d29f12 100644 --- a/common/.config/nvim/lsp/jsonls.lua +++ b/common/.config/nvim/lsp/jsonls.lua @@ -1,14 +1,8 @@ return { - -- lazy-load schemastore when needed - on_new_config = function(new_config) - new_config.settings.json.schemas = new_config.settings.json.schemas or {} - vim.list_extend(new_config.settings.json.schemas, require("schemastore").json.schemas()) - end, + cmd = { "vscode-json-languageserver", "--stdio" }, settings = { json = { - format = { - enable = true, - }, + format = { enable = true }, validate = { enable = true }, }, }, diff --git a/common/.config/nvim/lsp/lua_ls.lua b/common/.config/nvim/lsp/lua_ls.lua index 30e9298..46bb512 100644 --- a/common/.config/nvim/lsp/lua_ls.lua +++ b/common/.config/nvim/lsp/lua_ls.lua @@ -1,28 +1,20 @@ return { + cmd = { "lua-language-server" }, + filetype = { "lua" }, settings = { - typescript = { - updateImportOnFileMove = { enabled = "always" }, - suggest = { completeFunctionCalls = true }, - inlayHints = { - includeInlayParameterNameHints = "all", - includeInlayParameterNameHintsWhenArgumentMatchesName = false, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = true, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, + Lua = { + runtime = { + version = "LuaJIT", + path = vim.split(package.path, ";"), }, - }, - javascript = { - inlayHints = { - includeInlayParameterNameHints = "all", - includeInlayParameterNameHintsWhenArgumentMatchesName = false, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = true, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, + diagnostics = { + globals = { "vim" }, }, + workspace = { + checkThirdParty = false, + library = { vim.env.VIMRUNTIME }, + }, + telemetry = { enable = false }, }, }, } diff --git a/common/.config/nvim/lsp/markdownlint.lua b/common/.config/nvim/lsp/markdownlint.lua index a564707..d0d4107 100644 --- a/common/.config/nvim/lsp/markdownlint.lua +++ b/common/.config/nvim/lsp/markdownlint.lua @@ -1 +1,4 @@ -return {} +return { + cmd = { "markdownlint-language-server", "--stdio" }, + filetypes = { "markdown" }, +} diff --git a/common/.config/nvim/lsp/markman.lua b/common/.config/nvim/lsp/markman.lua deleted file mode 100644 index a564707..0000000 --- a/common/.config/nvim/lsp/markman.lua +++ /dev/null @@ -1 +0,0 @@ -return {} diff --git a/common/.config/nvim/lsp/marksman.lua b/common/.config/nvim/lsp/marksman.lua new file mode 100644 index 0000000..bb56b25 --- /dev/null +++ b/common/.config/nvim/lsp/marksman.lua @@ -0,0 +1,4 @@ +return { + cmd = { "marksman", "server" }, + filetypes = { "markdown" }, +} diff --git a/common/.config/nvim/lsp/prettier.lua b/common/.config/nvim/lsp/prettier.lua index a564707..fc55be1 100644 --- a/common/.config/nvim/lsp/prettier.lua +++ b/common/.config/nvim/lsp/prettier.lua @@ -1 +1,13 @@ -return {} +return { + cmd = { "prettier", "--lsp" }, + filetypes = { + "javascript", + "typescript", + "css", + "scss", + "html", + "json", + "yaml", + }, + root_markers = { ".prettierrc", "package.json" }, +} diff --git a/common/.config/nvim/lsp/pylsp.lua b/common/.config/nvim/lsp/pylsp.lua index a564707..84cae12 100644 --- a/common/.config/nvim/lsp/pylsp.lua +++ b/common/.config/nvim/lsp/pylsp.lua @@ -1 +1,7 @@ -return {} +return { + cmd = { "pylsp" }, + filetypes = { "python" }, + settings = { + pylsp = {}, + }, +} diff --git a/common/.config/nvim/lsp/shellcheck.lua b/common/.config/nvim/lsp/shellcheck.lua index a564707..c8e2219 100644 --- a/common/.config/nvim/lsp/shellcheck.lua +++ b/common/.config/nvim/lsp/shellcheck.lua @@ -1 +1,4 @@ -return {} +return { + cmd = { "shellcheck", "--format=json", "-" }, + filetypes = { "sh", "bash", "zsh" }, +} diff --git a/common/.config/nvim/lsp/shellharden.lua b/common/.config/nvim/lsp/shellharden.lua index a564707..1a648c9 100644 --- a/common/.config/nvim/lsp/shellharden.lua +++ b/common/.config/nvim/lsp/shellharden.lua @@ -1 +1,4 @@ -return {} +return { + cmd = { "shellharden", "--lsp" }, + filetypes = { "sh", "bash", "zsh" }, +} diff --git a/common/.config/nvim/lsp/shfmt.lua b/common/.config/nvim/lsp/shfmt.lua index a564707..43bd8e2 100644 --- a/common/.config/nvim/lsp/shfmt.lua +++ b/common/.config/nvim/lsp/shfmt.lua @@ -1 +1,4 @@ -return {} +return { + cmd = { "shfmt", "-l", "-" }, + filetypes = { "sh", "bash", "zsh" }, +} diff --git a/common/.config/nvim/lsp/sqlls.lua b/common/.config/nvim/lsp/sqlls.lua index a564707..e286a34 100644 --- a/common/.config/nvim/lsp/sqlls.lua +++ b/common/.config/nvim/lsp/sqlls.lua @@ -1 +1,4 @@ -return {} +return { + cmd = { "sql-language-server", "up", "--method", "stdio" }, + filetypes = { "sql" }, +} diff --git a/common/.config/nvim/lsp/taplo.lua b/common/.config/nvim/lsp/taplo.lua index a564707..e4522e2 100644 --- a/common/.config/nvim/lsp/taplo.lua +++ b/common/.config/nvim/lsp/taplo.lua @@ -1 +1,9 @@ -return {} +return { + cmd = { "taplo", "lsp", "stdio" }, + filetypes = { "toml" }, + settings = { + taplo = { + evenBetterToml = { schema = true }, + }, + }, +} diff --git a/common/.config/nvim/lsp/trivy.lua b/common/.config/nvim/lsp/trivy.lua index a564707..4d03baf 100644 --- a/common/.config/nvim/lsp/trivy.lua +++ b/common/.config/nvim/lsp/trivy.lua @@ -1 +1,5 @@ -return {} +return { + cmd = { "trivy", "server" }, + filetypes = { "dockerfile", "yaml", "json" }, + root_markers = { ".git", "Dockerfile", "docker-compose.yaml" }, +} diff --git a/common/.config/nvim/lsp/ts_ls.lua b/common/.config/nvim/lsp/ts_ls.lua index 30e9298..296281b 100644 --- a/common/.config/nvim/lsp/ts_ls.lua +++ b/common/.config/nvim/lsp/ts_ls.lua @@ -1,4 +1,14 @@ return { + cmd = { "typescript-language-server", "--stdio" }, + filetypes = { + "typescript", + "typescriptreact", + "typescript.txt", + "javascript", + "javascriptreact", + "javascript.jsx", + }, + root_markers = { "package.json", "tsconfig.json", ".git" }, settings = { typescript = { updateImportOnFileMove = { enabled = "always" }, diff --git a/common/.config/nvim/lsp/yamlls.lua b/common/.config/nvim/lsp/yamlls.lua index a564707..ff0d2fd 100644 --- a/common/.config/nvim/lsp/yamlls.lua +++ b/common/.config/nvim/lsp/yamlls.lua @@ -1 +1,11 @@ -return {} +return { + cmd = { "yaml-language-server", "--stdio" }, + filetypes = { "yaml" }, + settings = { + yaml = { + format = { enable = true }, + validate = true, + schemaStore = { enable = true }, + }, + }, +}