summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nvim/init.lua17
1 files changed, 11 insertions, 6 deletions
diff --git a/nvim/init.lua b/nvim/init.lua
index 7758df9..610018e 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -457,7 +457,9 @@ require('lazy').setup({
'neovim/nvim-lspconfig',
dependencies = {
-- Automatically install LSPs and related tools to stdpath for Neovim
- { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
+ -- Mason must be loaded before its dependents so we need to set it up here.
+ -- NOTE: `opts = {}` is the same as calling `require('mason').setup({})`
+ { 'williamboman/mason.nvim', opts = {} },
'williamboman/mason-lspconfig.nvim',
'WhoIsSethDaniel/mason-tool-installer.nvim',
@@ -646,13 +648,16 @@ require('lazy').setup({
}
-- Ensure the servers and tools above are installed
- -- To check the current status of installed tools and/or manually install
- -- other tools, you can run
+ --
+ -- To check the current status of installed tools and/or manually install
+ -- other tools, you can run
-- :Mason
--
- -- You can press `g?` for help in this menu.
- require('mason').setup()
-
+ -- You can press `g?` for help in this menu.
+ --
+ -- `mason` had to be setup earlier: to configure its options see the
+ -- `dependencies` table for `nvim-lspconfig` above.
+ --
-- You can add other tools here that you want Mason to install
-- for you, so that they are available from within Neovim.
local ensure_installed = vim.tbl_keys(servers or {})