diff --git a/lazy-lock.json b/lazy-lock.json index b8e2a12..4662398 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,6 +13,7 @@ "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, "lsp-zero.nvim": { "branch": "v2.x", "commit": "73bc33fe9ad5a1d4501536fdd4755b3aa18c3392" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, + "mason-lspconfig": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" }, diff --git a/lua/rayandrew/plugins.lua b/lua/rayandrew/plugins.lua index 93c4836..c57e170 100644 --- a/lua/rayandrew/plugins.lua +++ b/lua/rayandrew/plugins.lua @@ -594,6 +594,30 @@ return { -- LSP Configuration ------------------------------ + -- Mason + { + "williamboman/mason-lspconfig.nvim", + name = "mason-lspconfig", + dependencies = { + { "williamboman/mason.nvim", lazy = true }, + { "neovim/nvim-lspconfig", lazy = true }, + }, + opts = { + ensure_installed = { + "clangd", + "pyright", + -- "rnix", + "rust_analyzer", + "texlab", + "lua_ls", + "tsserver", + }, + }, + -- config = function(_, opts) + -- require("mason-lspconfig").setup(opts) + -- end, + }, + -- LSP Zero { "VonHeikemen/lsp-zero.nvim", @@ -737,11 +761,6 @@ return { -- (Optional) Configure lua language server for neovim require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls()) - lsp.ensure_installed({ - "tsserver", - "rust_analyzer", - }) - lsp.set_preferences({ suggest_lsp_servers = false, sign_icons = {