From c8cf4a0598416e8cfba941d9a315ef6a0acdb35a Mon Sep 17 00:00:00 2001 From: Georgios Atheridis Date: Tue, 16 Jul 2024 21:12:17 +0100 Subject: [PATCH] Enable auto install for lsp --- lazy-lock.json | 6 +++--- lua/lsp.lua | 21 ++++++++++++++++++++- lua/plugins.lua | 1 + 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 9b56a14..4396121 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,15 +8,14 @@ "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" }, - "idris2-nvim": { "branch": "main", "commit": "8bff02984a33264437e70fd9fff4359679d910da" }, "lazy.nvim": { "branch": "main", "commit": "b02c9eae6a250f98908c146d1dc1a891f5019f0a" }, "leap-ast.nvim": { "branch": "main", "commit": "1a21b70505ebb868a1e196c0d63797e1426b53a5" }, "leap.nvim": { "branch": "main", "commit": "c099aecaf858574909bd38cbadb8543c4dd16611" }, "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, + "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" }, "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, "none-ls.nvim": { "branch": "main", "commit": "0d1b3fa2ad0b371b94cb4b9a27ba6e5a1a915c91" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, "nvim-cmp": { "branch": "main", "commit": "7e348da6e5085ac447144a2ef4b637220ba27209" }, "nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" }, @@ -34,8 +33,9 @@ "telescope-frecency.nvim": { "branch": "master", "commit": "bb2c63ee5375ede81c1945b58638412af42b2d62" }, "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, "toggleterm.nvim": { "branch": "main", "commit": "cd55bf6aab3f88c259fa29ea86bbdcb1a325687d" }, + "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, "vim-bufsurf": { "branch": "master", "commit": "e6dbc7ad66c7e436e5eb20d304464e378bd7f28c" }, "vim-visual-multi": { "branch": "master", "commit": "38b0e8d94a5499ccc17d6159763d32c79f53417b" }, "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, "which-key.nvim": { "branch": "main", "commit": "f392212fd372e61171d9f81e4ab1ba28132b00d0" } -} \ No newline at end of file +} diff --git a/lua/lsp.lua b/lua/lsp.lua index ba1f30b..6cf9a8d 100644 --- a/lua/lsp.lua +++ b/lua/lsp.lua @@ -10,7 +10,19 @@ if not status_ok_mason_lspconfig then vim.notify("Error with mason-lspconfig") return end -mason_lspconfig.setup() +mason_lspconfig.setup { + ensure_installed = { + "cmake", + "bashls", + "tsserver", + "cssls", + "html", + "pyright", + "clangd", + "lua_ls", + "rust_analyzer", + }, +} local status_ok_treesitter, treesitter = pcall(require, "nvim-treesitter") if not status_ok_treesitter then @@ -151,6 +163,7 @@ require("lspconfig")["gopls"].setup { require("lspconfig")["lemminx"].setup { capabilities = capabilities, } + require('lspconfig')['lua_ls'].setup { capabilities = capabilities, settings = { @@ -162,6 +175,7 @@ require('lspconfig')['lua_ls'].setup { }, } + local status_ok_null_ls, null_ls = pcall(require, "null-ls") if status_ok_null_ls then null_ls.setup({ @@ -174,3 +188,8 @@ if status_ok_null_ls then }, }) end + +require("mason-null-ls").setup({ + ensure_installed = nil, + automatic_installation = true, +}) diff --git a/lua/plugins.lua b/lua/plugins.lua index a8bd7db..8085a9e 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -53,6 +53,7 @@ require("lazy").setup({ "williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim", + "jay-babu/mason-null-ls.nvim", "nvimtools/none-ls.nvim", "nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter-textobjects", -- 2.30.2