thomasave
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into laptop

This commit is contained in:
Thomas Avé 2024-02-08 15:16:11 +01:00
parent cfce70c365 3437fa153c
commit 6660cf5e98
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nvim/lua/plugins/mason.lua
View File

@ -11,6 +11,6 @@ return {
'neovim/nvim-lspconfig' 'neovim/nvim-lspconfig'
}, },
opts = { opts = {
ensure_installed = { "pyright", "texlab", "clangd", "bashls", "cmake", "jsonls", "tsserver", "vuels", "dockerls", "vimls", "html", "yamlls", "cssls", "lua_ls", "ltex", "gopls", "rust_analyzer", "jdtls", "emmet_ls", "ruff_lsp" }, ensure_installed = { "pyright", "texlab", "clangd", "bashls", "cmake", "jsonls", "tsserver", "vuels", "dockerls", "vimls", "html", "yamlls", "cssls", "lua_ls", "ltex", "gopls", "rust_analyzer", "jdtls", "emmet_ls", "ruff_lsp", "csharp_ls" },
} }
} }

10
nvim/lua/plugins/none-ls.lua
View File

@ -6,15 +6,15 @@ return {
null_ls.setup({ null_ls.setup({
root_dir = require("null-ls.utils").root_pattern(".git", "Makefile", "CMakeLists.txt", "build/", "meson.build"), root_dir = require("null-ls.utils").root_pattern(".git", "Makefile", "CMakeLists.txt", "build/", "meson.build"),
sources = { sources = {
null_ls.builtins.completion.spell, -- null_ls.builtins.completion.spell,
null_ls.builtins.code_actions.proselint, -- null_ls.builtins.code_actions.proselint,
null_ls.builtins.diagnostics.proselint, -- null_ls.builtins.diagnostics.proselint,
null_ls.builtins.diagnostics.codespell, -- null_ls.builtins.diagnostics.codespell,
null_ls.builtins.diagnostics.shellcheck, null_ls.builtins.diagnostics.shellcheck,
null_ls.builtins.formatting.shellharden, null_ls.builtins.formatting.shellharden,
null_ls.builtins.formatting.shfmt, null_ls.builtins.formatting.shfmt,
-- null_ls.builtins.diagnostics.cppcheck, -- null_ls.builtins.diagnostics.cppcheck,
null_ls.builtins.diagnostics.selene -- null_ls.builtins.diagnostics.selene
} }
}) })
end, end,

4
nvim/lua/plugins/nvim-cmp.lua
View File

@ -147,6 +147,10 @@ return {
capabilities = capabilities capabilities = capabilities
} }
require('lspconfig').csharp_ls.setup {
capabilities = capabilities
}
require('lspconfig').cmake.setup { require('lspconfig').cmake.setup {
capabilities = capabilities capabilities = capabilities
} }