up

1 files changed, 29 insertions, 15 deletions

diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua
index d562e6f..fc2e7ab 100644
--- a/.config/nvim/after/plugin/lsp.lua
+++ b/.config/nvim/after/plugin/lsp.lua
@@ -17,25 +17,31 @@ lsp.on_attach(function(client, bufnr)
 	vim.keymap.set('i', '<C-h>', function() vim.lsp.buf.signature_help() end, opts)
 end)
 
-require('mason').setup({})
-require('mason-lspconfig').setup({
-	ensure_installed = {
-		'tsserver',
-		'eslint',
-		'rust_analyzer',
-		'lua_ls',
-		'gopls',
-		'arduino_language_server',
-		'bashls',
-		'perlnavigator',
+require('mason').setup({
+	servers = {
 		'clangd',
-		'yamlls',
 	},
-  handlers = {
-    lsp.default_setup,
-  },
 })
 
+
+-- require('mason-lspconfig').setup({
+-- 	ensure_installed = {
+-- 		'tsserver',
+-- 		'eslint',
+-- 		'rust_analyzer',
+-- 		'lua_ls',
+-- 		'gopls',
+-- 		'arduino_language_server',
+-- 		'bashls',
+-- 		'perlnavigator',
+-- 		'clangd',
+-- 		'yamlls',
+-- 	},
+--   handlers = {
+--     lsp.default_setup,
+--   },
+-- })
+
 -- langs
 
 require('lspconfig').gopls.setup({
@@ -59,6 +65,14 @@ require('lspconfig').gopls.setup({
 	},
 })
 
+require('lspconfig').clangd.setup({
+	settings = {
+		clangd = {
+			mason = false,
+		},
+	},
+})
+
 require'lspconfig'.terraformls.setup{}
 vim.api.nvim_create_autocmd({"BufWritePre"}, {
 	pattern = {"*.tf", "*.tfvars"},