From 8b9e1eda07d03248647eb70b0c108338a4fce48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Mon, 25 Jul 2022 14:27:06 +0200 Subject: [PATCH] Switch to Mason.nvim --- awesome/rc.lua | 1 - nvim/lua/lsp_config.lua | 14 +++++++++++--- nvim/lua/plugins.lua | 3 ++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/awesome/rc.lua b/awesome/rc.lua index 7a4cced..7576fb2 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -40,7 +40,6 @@ local run_on_start_up = { "numlockx on", "bluetoothctl power on", "nm-applet", - "blueman-applet", "xcape -e \"Super_L=Super_L|d\"" } diff --git a/nvim/lua/lsp_config.lua b/nvim/lua/lsp_config.lua index 2d2ef73..8f9dfb9 100644 --- a/nvim/lua/lsp_config.lua +++ b/nvim/lua/lsp_config.lua @@ -83,9 +83,17 @@ cmp.event:on('confirm_done',cmp_completion.on_confirm_done()) -- Setup lspconfig. local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) -require("nvim-lsp-installer").setup({ - automatic_installation = true, -- automatically detect which servers to install (based on which servers are set up via lspconfig) -}) + +require("mason").setup { + ui = { + icons = { + package_installed = "✓" + } + } +} +require("mason-lspconfig").setup { + ensure_installed = { "pyright", "texlab", "clangd", "bashls", "cmake", "jsonls", "tsserver", "vuels", "dockerls", "vimls", "html", "yamlls", "cssls", "sumneko_lua", "ltex"}, +} require('lspconfig').pyright.setup { capabilities = capabilities diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index bd0a8c9..cd93933 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -8,6 +8,8 @@ require('packer').startup(function(use) use '~/.config/nvim/colorschemes/material' use 'gpanders/editorconfig.nvim' use 'ervandew/supertab' + use 'williamboman/mason.nvim' + use 'williamboman/mason-lspconfig.nvim' use 'ggandor/leap.nvim' use 'hrsh7th/cmp-buffer' use 'hrsh7th/cmp-cmdline' @@ -23,7 +25,6 @@ require('packer').startup(function(use) use 'vimwiki/vimwiki' use 'intrntbrn/awesomewm-vim-tmux-navigator' use 'wbthomason/packer.nvim' - use 'williamboman/nvim-lsp-installer' use 'windwp/nvim-autopairs' use { 'TimUntersberger/neogit', requires = 'nvim-lua/plenary.nvim' } use {'nvim-lualine/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true }}