Moving away from null-ls

1 files changed, 37 insertions, 61 deletions

diff --git a/lua/ben/plugins/lsp/mason.lua b/lua/ben/plugins/lsp/mason.lua
index a1af193..cafdb3b 100644
--- a/lua/ben/plugins/lsp/mason.lua
+++ b/lua/ben/plugins/lsp/mason.lua
@@ -1,65 +1,41 @@
 return {
-	"williamboman/mason.nvim",
-	event = "VeryLazy",
-	dependencies = {
-		"williamboman/mason-lspconfig.nvim",
-		"jayp0521/mason-null-ls.nvim",
-	},
-	config = function()
-		-- import mason
-		local mason = require("mason")
+  "williamboman/mason.nvim",
+  dependencies = {
+    "williamboman/mason-lspconfig.nvim",
 
-		-- import mason-lspconfig
-		local mason_lspconfig = require("mason-lspconfig")
+  },
+  config = function()
+    --import mason
+    local mason = require("mason")
+    -- import mason-lspconfig
+    local mason_lspconfig = require("mason-lspconfig")
 
-		-- import mason-null-ls
-		local mason_null_ls = require("mason-null-ls")
-
-		-- enable mason and configure icons
-		mason.setup({
-			ui = {
-				icons = {
-					package_installed = "✓",
-					package_pending = "➜",
-					package_uninstalled = "✗",
-				},
-			},
-		})
-
-		mason_lspconfig.setup({
-			-- list of servers for mason to install
-			ensure_installed = {
-				"tsserver",
-				"html",
-				"cssls",
-				"tailwindcss",
-				"svelte",
-				"gopls",
-				"texlab",
-				"lua_ls",
-				"graphql",
-				"emmet_ls",
-				"prismals",
-				"pyright",
-				"dockerls",
-				"docker_compose_language_service",
-				"clangd",
-				"cmake",
-				"bashls",
-			},
-			-- auto-install configured servers (with lspconfig)
-			automatic_installation = true, -- not the same as ensure_installed
-		})
-
-		mason_null_ls.setup({
-			-- list of formatters & linters for mason to install
-			ensure_installed = {
-				"prettier", -- ts/js formatter
-				"stylua", -- lua formatter
-				"eslint_d", -- ts/js linter
-			},
-			-- auto-install configured servers (with lspconfig)
-			automatic_installation = true,
-		})
-	end,
+    -- enable mason and configure icons
+    mason.setup({
+      ui = {
+       icons = {
+         package_installed = "",
+         package_pending = "",
+         package_uninstalled = ""
+       },
+     },
+   })
+   mason_lspconfig.setup({
+     -- list of servers for mason to install
+     ensure_installed = {
+       "prettier",
+        "bibtex-tidy",
+        "goimports",
+        "gci",
+        "golines",
+        "shfmt",
+        "latexindent",
+        "sql_formatter",
+        "isort", "black",
+        "yamlfix",
+     },
+     -- auto-install configured servers (with lspconfig)
+     automatic_installation = true, -- not the same as ensure_installed
+   })
+  end,
 }