From c81546ee262b75d45c9e8b2e9c883a01796c8af5 Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Fri, 2 Feb 2024 19:18:40 -0700 Subject: [PATCH] Add Mason for managing LSPs --- after/plugin/lsp-zero.lua | 17 ----------------- lua/cam123/lazy.lua | 2 ++ 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/after/plugin/lsp-zero.lua b/after/plugin/lsp-zero.lua index 5423aea..748cfe1 100644 --- a/after/plugin/lsp-zero.lua +++ b/after/plugin/lsp-zero.lua @@ -1,29 +1,12 @@ -local lsp_zero_config = { - call_servers = 'global', -} - -local lsp_servers = { - 'zls', - 'nixd', - 'gopls', - 'pylsp', - 'templ', - 'ansiblels', - 'rust_analyzer', -} - vim.filetype.add({ extension = { templ = "templ" } }) local lsp = require('lsp-zero').preset({}) -lsp.set_preferences(lsp_zero_config) lsp.on_attach(function(_, bufnr) lsp.default_keymaps({buffer = bufnr}) end) -lsp.setup_servers(lsp_servers) - local lsp_config = require('lspconfig') lsp_config.lua_ls.setup(lsp.nvim_lua_ls()) diff --git a/lua/cam123/lazy.lua b/lua/cam123/lazy.lua index 6ebb1dd..57eb568 100644 --- a/lua/cam123/lazy.lua +++ b/lua/cam123/lazy.lua @@ -37,6 +37,8 @@ require('lazy').setup({ branch = 'v2.x', dependencies = { {'neovim/nvim-lspconfig'}, + {'williamboman/mason.nvim'}, + {'williamboman/mason-lspconfig.nvim'}, {'hrsh7th/nvim-cmp'}, {'hrsh7th/cmp-nvim-lsp'},