diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/nvim/lsp/clangd.lua | 10 | ||||
| -rw-r--r-- | .config/nvim/lsp/cssls.lua | 11 | ||||
| -rw-r--r-- | .config/nvim/lsp/gopls.lua | 6 | ||||
| -rw-r--r-- | .config/nvim/lsp/html.lua | 11 | ||||
| -rw-r--r-- | .config/nvim/lsp/jsonls.lua | 10 | ||||
| -rw-r--r-- | .config/nvim/lsp/lua_ls.lua | 11 | ||||
| -rw-r--r-- | .config/nvim/lsp/mesonlsp.lua | 9 | ||||
| -rw-r--r-- | .config/nvim/lsp/ruff.lua | 10 | ||||
| -rw-r--r-- | .config/nvim/lsp/ts_ls.lua | 44 |
9 files changed, 13 insertions, 109 deletions
diff --git a/.config/nvim/lsp/clangd.lua b/.config/nvim/lsp/clangd.lua index 4f0b351..ce827a8 100644 --- a/.config/nvim/lsp/clangd.lua +++ b/.config/nvim/lsp/clangd.lua @@ -1,14 +1,4 @@ return { - cmd = { 'clangd' }, - filetypes = { 'c', 'cpp', 'objc', 'objcpp', 'cuda', 'proto' }, - root_markers = { - '.clangd', - '.clang-tidy', - '.clang-format', - 'compile_commands.json', - 'compile_flags.txt', - 'meson.build', - }, settings = { clangd = { InlayHints = { diff --git a/.config/nvim/lsp/cssls.lua b/.config/nvim/lsp/cssls.lua deleted file mode 100644 index 10b60ec..0000000 --- a/.config/nvim/lsp/cssls.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - cmd = { 'vscode-css-language-server', '--stdio' }, - filetypes = { 'css', 'scss', 'less' }, - init_options = { provideFormatter = true }, - root_markers = { 'package.json' }, - settings = { - css = { validate = true }, - scss = { validate = true }, - less = { validate = true }, - }, -} diff --git a/.config/nvim/lsp/gopls.lua b/.config/nvim/lsp/gopls.lua index e3d00bc..765a0d5 100644 --- a/.config/nvim/lsp/gopls.lua +++ b/.config/nvim/lsp/gopls.lua @@ -1,10 +1,4 @@ return { - cmd = { 'gopls' }, - filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' }, - root_markers = { - 'go.work', - 'go.mod', - }, settings = { gopls = { hints = { diff --git a/.config/nvim/lsp/html.lua b/.config/nvim/lsp/html.lua deleted file mode 100644 index cc769d5..0000000 --- a/.config/nvim/lsp/html.lua +++ /dev/null @@ -1,11 +0,0 @@ -return { - cmd = { 'vscode-html-language-server', '--stdio' }, - filetypes = { 'html', 'templ' }, - root_markers = { 'package.json' }, - settings = {}, - init_options = { - provideFormatter = true, - embeddedLanguages = { css = true, javascript = true }, - configurationSection = { 'html', 'css', 'javascript' }, - }, -} diff --git a/.config/nvim/lsp/jsonls.lua b/.config/nvim/lsp/jsonls.lua deleted file mode 100644 index 234cc94..0000000 --- a/.config/nvim/lsp/jsonls.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - cmd = { 'vscode-json-language-server', '--stdio' }, - filetypes = { 'json', 'jsonc' }, - init_options = { - provideFormatter = true, - }, - root_marker = {}, - single_file_support = true, -} - diff --git a/.config/nvim/lsp/lua_ls.lua b/.config/nvim/lsp/lua_ls.lua index 92e92fc..b4fd5c8 100644 --- a/.config/nvim/lsp/lua_ls.lua +++ b/.config/nvim/lsp/lua_ls.lua @@ -1,15 +1,4 @@ return { - cmd = { 'lua-language-server' }, - filetypes = { 'lua' }, - root_markers = { - '.luarc.json', - '.luarc.jsonc', - '.luacheckrc', - '.stylua.toml', - 'stylua.toml', - 'selene.toml', - 'selene.yml', - }, settings = { Lua = { runtime = { diff --git a/.config/nvim/lsp/mesonlsp.lua b/.config/nvim/lsp/mesonlsp.lua deleted file mode 100644 index 6e7dd5d..0000000 --- a/.config/nvim/lsp/mesonlsp.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - cmd = { 'mesonlsp', '--lsp' }, - filetypes = { 'meson' }, - root_markers = { - 'meson.build', - 'meson_options.txt', - 'meson.options' - }, -} diff --git a/.config/nvim/lsp/ruff.lua b/.config/nvim/lsp/ruff.lua deleted file mode 100644 index 0d174b3..0000000 --- a/.config/nvim/lsp/ruff.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - cmd = { 'ruff', 'server' }, - filetypes = { 'python' }, - root_marker = { - 'pyproject.toml', - 'ruff.toml', - '.ruff.toml' - }, - single_file_support = true, -} diff --git a/.config/nvim/lsp/ts_ls.lua b/.config/nvim/lsp/ts_ls.lua index 860951b..95a179d 100644 --- a/.config/nvim/lsp/ts_ls.lua +++ b/.config/nvim/lsp/ts_ls.lua @@ -1,39 +1,21 @@ +local inlayHints = { + includeInlayParameterNameHints = "all", + includeInlayParameterNameHintsWhenArgumentMatchesName = false, + includeInlayFunctionParameterTypeHints = true, + includeInlayVariableTypeHints = true, + includeInlayVariableTypeHintsWhenTypeMatchesName = false, + includeInlayPropertyDeclarationTypeHints = true, + includeInlayFunctionLikeReturnTypeHints = true, + includeInlayEnumMemberValueHints = true, +} + return { - init_options = { hostInfo = 'neovim' }, - cmd = { 'typescript-language-server', '--stdio' }, - filetypes = { - 'javascript', - 'javascriptreact', - 'javascript.jsx', - 'typescript', - 'typescriptreact', - 'typescript.tsx', - }, - root_markers = { 'tsconfig.json', 'jsconfig.json', 'package.json'}, settings = { typescript = { - inlayHints = { - includeInlayParameterNameHints = "all", - includeInlayParameterNameHintsWhenArgumentMatchesName = false, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = true, - includeInlayVariableTypeHintsWhenTypeMatchesName = false, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, - }, + inlayHints = inlayHints, }, javascript = { - inlayHints = { - includeInlayParameterNameHints = "all", - includeInlayParameterNameHintsWhenArgumentMatchesName = false, - includeInlayFunctionParameterTypeHints = true, - includeInlayVariableTypeHints = true, - includeInlayVariableTypeHintsWhenTypeMatchesName = false, - includeInlayPropertyDeclarationTypeHints = true, - includeInlayFunctionLikeReturnTypeHints = true, - includeInlayEnumMemberValueHints = true, - }, + inlayHints = inlayHints, }, } } |