3 files changed, 55 insertions, 35 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua
index e79164c..b370196 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua
@@ -73,24 +73,44 @@ M.plugins = function(use)
 	})
 
 	use({
-		"mfussenegger/nvim-lint",
+		"williamboman/mason.nvim",
+		requires = {},
 		config = function()
-			require("tobyvin.plugins.lint").setup()
+			require("tobyvin.plugins.mason").setup()
 		end,
 	})
 
 	use({
-		"mhartington/formatter.nvim",
+		"jose-elias-alvarez/null-ls.nvim",
+		requires = {
+			"nvim-lua/plenary.nvim",
+		},
 		config = function()
-			require("tobyvin.plugins.formatter").setup()
+			require("tobyvin.plugins.null-ls").setup()
 		end,
 	})
 
 	use({
-		"williamboman/mason.nvim",
-		requires = {},
+		"jayp0521/mason-null-ls.nvim",
+		after = { "mason.nvim", "null-ls.nvim" },
+		requires = {
+			"williamboman/mason.nvim",
+			"jose-elias-alvarez/null-ls.nvim",
+		},
 		config = function()
-			require("tobyvin.plugins.mason").setup()
+			require("tobyvin.plugins.mason-null-ls").setup()
+		end,
+	})
+
+	use({
+		"saecki/crates.nvim",
+		event = { "BufRead Cargo.toml" },
+		requires = {
+			"nvim-lua/plenary.nvim",
+			"jose-elias-alvarez/null-ls.nvim",
+		},
+		config = function()
+			require("tobyvin.plugins.crates").setup()
 		end,
 	})
 
@@ -203,17 +223,6 @@ M.plugins = function(use)
 	})
 
 	use({
-		"saecki/crates.nvim",
-		event = { "BufRead Cargo.toml" },
-		requires = {
-			"nvim-lua/plenary.nvim",
-		},
-		config = function()
-			require("tobyvin.plugins.crates").setup()
-		end,
-	})
-
-	use({
 		"onsails/lspkind-nvim",
 		config = function()
 			require("tobyvin.plugins.lspkind").setup()
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/mason-null-ls.lua b/nvim/.config/nvim/lua/tobyvin/plugins/mason-null-ls.lua
new file mode 100644
index 0000000..249e2a9
--- /dev/null
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/mason-null-ls.lua
@@ -0,0 +1,15 @@
+local M = {}
+
+M.setup = function()
+	local status_ok, mason_null_ls = pcall(require, "mason-null-ls")
+	if not status_ok then
+		vim.notify("Failed to load module 'mason-null-ls'", "error")
+		return
+	end
+
+	mason_null_ls.setup()
+
+	vim.keymap.set("n", "<leader>N", "<CMD>NullLsInstall<CR>", { desc = "Null-LS Install" })
+end
+
+return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua
index f1b37bd..ed7817a 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua
@@ -8,30 +8,26 @@ M.setup = function()
 		return
 	end
 
-	local code_actions = null_ls.builtins.code_actions
-	local formatting = null_ls.builtins.formatting
-
 	null_ls.setup({
 		sources = {
-			-- Code Actions
-			code_actions.gitrebase,
 			-- Disabled until sorting for code_actions gets pushed. See: https://github.com/stevearc/dressing.nvim/issues/22
-			-- code_actions.gitsigns,
-			code_actions.shellcheck,
+			-- null_ls.builtins.code_actions.gitsigns,
+			null_ls.builtins.code_actions.gitrebase,
+			null_ls.builtins.code_actions.shellcheck,
+
+			null_ls.builtins.diagnostics.pylint,
+			null_ls.builtins.diagnostics.vale,
 
-			-- Formatting
-			formatting.prettier,
-			formatting.black,
-			formatting.latexindent,
-			formatting.stylua,
-			formatting.shfmt,
+			null_ls.builtins.formatting.prettier,
+			null_ls.builtins.formatting.black,
+			null_ls.builtins.formatting.latexindent,
+			null_ls.builtins.formatting.stylua,
+			null_ls.builtins.formatting.shfmt,
 		},
 		on_attach = lsp.on_attach,
-		-- on_attach = function(client, bufnr)
-		-- 	client.server_capabilities.documentFormattingProvider = client.supports_method("textDocument/formatting")
-		-- 	lsp.on_attach(client, bufnr)
-		-- end,
 	})
+
+	vim.keymap.set("n", "<leader>n", "<CMD>NullLsInfo<CR>", { desc = "Null-LS Info" })
 end
 
 return M