diff --git a/lua/core/plugin_config/lsp_config.lua b/lua/core/plugin_config/lsp_config.lua index bf4addf..f38ed96 100644 --- a/lua/core/plugin_config/lsp_config.lua +++ b/lua/core/plugin_config/lsp_config.lua @@ -1,5 +1,6 @@ require("mason").setup() require("mason-lspconfig").setup({ + automatic_enable = true, ensure_installed = { "lua_ls", "clangd", @@ -10,8 +11,6 @@ require("mason-lspconfig").setup({ "rust_analyzer", "taplo", "zls", - "gopls", - "templ" } }) -- gloabal mappings @@ -52,9 +51,7 @@ vim.api.nvim_create_autocmd('LspAttach', { -- Attach lsp to completion engine local capabilities = require("cmp_nvim_lsp").default_capabilities() -require("lspconfig").lua_ls.setup { - caplbilities = capabilities, - settings = { +vim.lsp.config.lua_ls.settings = { Lua = { diagnostics = { -- Get the language server to recognize the `vim` global @@ -73,15 +70,14 @@ require("lspconfig").lua_ls.setup { enable = false, }, }, - }, -} -require("lspconfig").clangd.setup { capabilities = capabilities } -require("lspconfig").cmake.setup { capabilities = capabilities } -require("lspconfig").ltex.setup { capabilities = capabilities, settings = { ltex = { language = "en-GB" } } } -require("lspconfig").ts_ls.setup { capabilities = capabilities } -require("lspconfig").jsonls.setup { capabilities = capabilities } -require("lspconfig").rust_analyzer.setup { capabilities = capabilities } -require("lspconfig").taplo.setup { capabilities = capabilities } -require("lspconfig").zls.setup { capabilities = capabilities } -require("lspconfig").gopls.setup { capabilities = capabilities } -require("lspconfig").templ.setup { capabilities = capabilities } + } +vim.lsp.config.lua_ls.capabilities = capabilities +vim.lsp.config.clangd.capabilities = capabilities +vim.lsp.config.cmake.capabilities = capabilities +vim.lsp.config.ltex.capabilities = capabilities +vim.lsp.config.ltex.settings = { ltex = { language = "en-GB" } } +vim.lsp.config.ts_ls.capabilities = capabilities +vim.lsp.config.jsonls.capabilities = capabilities +vim.lsp.config.rust_analyzer.capabilities = capabilities +vim.lsp.config.taplo.capabilities = capabilities +vim.lsp.config.zls.capabilities = capabilities diff --git a/lua/core/plugin_config/org.lua b/lua/core/plugin_config/org.lua index 0932765..9f43d74 100644 --- a/lua/core/plugin_config/org.lua +++ b/lua/core/plugin_config/org.lua @@ -26,7 +26,7 @@ require('cmp').setup({ require('org-bullets').setup() require("org-roam").setup({ - directory = "~/.vimwiki/org/roam/", + directory = "~/Sync/wiki/org/roam/", --org_files = { -- "~/another_org_dir", -- "~/some/folder/*.org",