Update

1 files changed, 29 insertions, 19 deletions

diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index ad6f420..0ddbbe9 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -1,3 +1,8 @@
+-- Language server for specified languages
+-- Hover with 'K'
+-- Goto definition with :Goto
+-- Open code action with :Codeact
+
 return {
   {
     "williamboman/mason.nvim",
@@ -8,31 +13,36 @@ return {
 
   {
     "williamboman/mason-lspconfig.nvim",
-    config = function()
-      require("mason-lspconfig").setup({
-        -- Add languages
-        ensure_installed = {
-          "bashls",
-          "clangd",
-          "lua_ls",
-          "marksman",
-          "pyright",
-          "rust_analyzer",
-        }
-      })
-    end
+    lazy = false,
+    opts = {
+      auto_install = true,
+    },
   },
 
   {
     "neovim/nvim-lspconfig",
     config = function()
+      -- Advertise autocompletion to lsp
+      local capabilities = require('cmp_nvim_lsp').default_capabilities()
       local lspconfig = require("lspconfig")
-      lspconfig.bashls.setup({})
-      lspconfig.lua_ls.setup({})
-      lspconfig.clangd.setup({})
-      lspconfig.marksman.setup({})
-      lspconfig.pyright.setup({})
-      lspconfig.rust_analyzer.setup({})
+      lspconfig.bashls.setup({
+        capabilities = capabilities
+      })
+      lspconfig.lua_ls.setup({
+        capabilities = capabilities
+      })
+      lspconfig.clangd.setup({
+        capabilities = capabilities
+      })
+      lspconfig.marksman.setup({
+        capabilities = capabilities
+      })
+      lspconfig.pyright.setup({
+        capabilities = capabilities
+      })
+      lspconfig.rust_analyzer.setup({
+        capabilities = capabilities
+      })
 
       -- Key mapping
       -- Hover for definition