Warwick/NeoVimConfiguration
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated mason_lsp

Browse source
This commit is contained in:
Warwick 2025-09-23 11:19:25 +01:00
parent c678cb061a
commit 519d602d32
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lua/core/plugin_config/lsp_config.lua
View file

@ -1,5 +1,6 @@
require("mason").setup() require("mason").setup()
require("mason-lspconfig").setup({ require("mason-lspconfig").setup({
automatic_enable = true,
ensure_installed = { ensure_installed = {
"lua_ls", "lua_ls",
"clangd", "clangd",
@ -10,8 +11,6 @@ require("mason-lspconfig").setup({
"rust_analyzer", "rust_analyzer",
"taplo", "taplo",
"zls", "zls",
"gopls",
"templ"
} }
}) })
-- gloabal mappings -- gloabal mappings
@ -52,9 +51,7 @@ vim.api.nvim_create_autocmd('LspAttach', {
-- Attach lsp to completion engine -- Attach lsp to completion engine
local capabilities = require("cmp_nvim_lsp").default_capabilities() local capabilities = require("cmp_nvim_lsp").default_capabilities()
require("lspconfig").lua_ls.setup { vim.lsp.config.lua_ls.settings = {
caplbilities = capabilities,
settings = {
Lua = { Lua = {
diagnostics = { diagnostics = {
-- Get the language server to recognize the `vim` global -- Get the language server to recognize the `vim` global
@ -73,15 +70,14 @@ require("lspconfig").lua_ls.setup {
enable = false, enable = false,
}, },
}, },
}, }
} vim.lsp.config.lua_ls.capabilities = capabilities
require("lspconfig").clangd.setup { capabilities = capabilities } vim.lsp.config.clangd.capabilities = capabilities
require("lspconfig").cmake.setup { capabilities = capabilities } vim.lsp.config.cmake.capabilities = capabilities
require("lspconfig").ltex.setup { capabilities = capabilities, settings = { ltex = { language = "en-GB" } } } vim.lsp.config.ltex.capabilities = capabilities
require("lspconfig").ts_ls.setup { capabilities = capabilities } vim.lsp.config.ltex.settings = { ltex = { language = "en-GB" } }
require("lspconfig").jsonls.setup { capabilities = capabilities } vim.lsp.config.ts_ls.capabilities = capabilities
require("lspconfig").rust_analyzer.setup { capabilities = capabilities } vim.lsp.config.jsonls.capabilities = capabilities
require("lspconfig").taplo.setup { capabilities = capabilities } vim.lsp.config.rust_analyzer.capabilities = capabilities
require("lspconfig").zls.setup { capabilities = capabilities } vim.lsp.config.taplo.capabilities = capabilities
require("lspconfig").gopls.setup { capabilities = capabilities } vim.lsp.config.zls.capabilities = capabilities
require("lspconfig").templ.setup { capabilities = capabilities }

2
lua/core/plugin_config/org.lua
View file

@ -26,7 +26,7 @@ require('cmp').setup({
require('org-bullets').setup() require('org-bullets').setup()
require("org-roam").setup({ require("org-roam").setup({
directory = "~/.vimwiki/org/roam/", directory = "~/Sync/wiki/org/roam/",
--org_files = { --org_files = {
-- "~/another_org_dir", -- "~/another_org_dir",
-- "~/some/folder/*.org", -- "~/some/folder/*.org",