feat(nvim): add neoconf.nvim

7 files changed, 40 insertions, 58 deletions

diff --git a/nvim/.config/nvim/.neoconf.json b/nvim/.config/nvim/.neoconf.json
new file mode 100644
index 0000000..4070ecb
--- /dev/null
+++ b/nvim/.config/nvim/.neoconf.json
@@ -0,0 +1,22 @@
+{
+    "neodev": {
+        "library": {
+            "enabled": true,
+            "plugins": true
+        }
+    },
+    "neoconf": {
+        "plugins": {
+            "lua_ls": {
+                "enabled": true
+            }
+        }
+    },
+    "lspconfig": {
+        "lua_ls": {
+            "Lua.diagnostics.globals": [
+                "vim"
+            ]
+        }
+    }
+}
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index b7ac851..cd0a05c 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -18,7 +18,6 @@
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "conform.nvim": { "branch": "master", "commit": "8f86444d62fc4f012a56732b8fb2c595e1e21fde" },
   "dressing.nvim": { "branch": "master", "commit": "c1e1d5fa44fe08811b6ef4aadac2b50e602f9504" },
-  "efmls-configs-nvim": { "branch": "main", "commit": "265037d589bde340227c60d2ceaaf552a2d83d85" },
   "ferris.nvim": { "branch": "main", "commit": "2ba71012d108dd630ef33681c767a8462709cd90" },
   "git-conflict.nvim": { "branch": "main", "commit": "896261933afe2fddf6fb043d9cd4d88301b151a9" },
   "gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" },
@@ -26,10 +25,10 @@
   "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" },
   "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "f014db32437aa61c86fc0ef1067cd2bc6a37205c" },
-  "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" },
   "mason-update-all": { "branch": "main", "commit": "007a4085fe5e830b9139313652e1553bf1a9b857" },
   "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
+  "neoconf.nvim": { "branch": "main", "commit": "00dcf2b81c45de1768b4171faa16729f0888cfb8" },
   "neodev.nvim": { "branch": "main", "commit": "e9dd1535759794635a951644c183beb327879407" },
   "neotest": { "branch": "master", "commit": "901891484db3d46ce43d56871273dc7d40621356" },
   "neotest-go": { "branch": "main", "commit": "1a15e1136db43775214a3e7a598f8930c29c94b7" },
diff --git a/nvim/.config/nvim/lua/plugins/lspconfig.lua b/nvim/.config/nvim/lua/plugins/lspconfig.lua
index a6e9b77..f75d6e2 100644
--- a/nvim/.config/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/.config/nvim/lua/plugins/lspconfig.lua
@@ -3,36 +3,23 @@ local M = {
 	"neovim/nvim-lspconfig",
 	event = "BufReadPre",
 	dependencies = {
-		"folke/neodev.nvim",
-		"hrsh7th/cmp-nvim-lsp",
-		"creativenull/efmls-configs-nvim",
+		{ "hrsh7th/cmp-nvim-lsp", opts = {} },
+		{ "folke/neodev.nvim", opts = {} },
+		{ "folke/neoconf.nvim", cmd = "Neoconf", dependencies = { "nvim-lspconfig" }, opts = {} },
 	},
 }
 
 function M:config()
-	local lspconfig = require("lspconfig")
-
+	require("neoconf")
+	require("lspconfig.util").default_config.capabilities = require("cmp_nvim_lsp").default_capabilities()
 	require("lspconfig.ui.windows").default_options.border = "single"
 
-	lspconfig.util.default_config = vim.tbl_extend("force", lspconfig.util.default_config, {
-		capabilities = require("cmp_nvim_lsp").default_capabilities(),
-	})
-
-	local available = lspconfig.util.available_servers()
+	local available = require("lspconfig.util").available_servers()
 	for name, config in pairs(require("tobyvin.lsp.configs")) do
 		if not vim.tbl_contains(available, name) then
-			lspconfig[name].setup(config)
+			require("lspconfig")[name].setup(config)
 		end
 	end
-
-	vim.api.nvim_create_autocmd("LspAttach", {
-		group = vim.api.nvim_create_augroup("tobyvin_lsp_config", { clear = true }),
-		desc = "lsp",
-		callback = function(args)
-			local lspinfo = require("lspconfig.ui.lspinfo")
-			vim.keymap.set("n", "<leader>li", lspinfo, { desc = "lsp info", buffer = args.buf })
-		end,
-	})
 end
 
 return M
diff --git a/nvim/.config/nvim/lua/plugins/mason-null-ls.lua b/nvim/.config/nvim/lua/plugins/mason-null-ls.lua
deleted file mode 100644
index 800badd..0000000
--- a/nvim/.config/nvim/lua/plugins/mason-null-ls.lua
+++ /dev/null
@@ -1,15 +0,0 @@
----@type LazyPluginSpec
-local M = {
-	"jayp0521/mason-null-ls.nvim",
-	version = "*",
-	cmd = {
-		"NullLsInstall",
-		"NullLsUninstall",
-	},
-	dependencies = { "williamboman/mason.nvim" },
-	opts = {
-		handlers = {},
-	},
-}
-
-return M
diff --git a/nvim/.config/nvim/lua/plugins/neodev.lua b/nvim/.config/nvim/lua/plugins/neodev.lua
deleted file mode 100644
index 466465e..0000000
--- a/nvim/.config/nvim/lua/plugins/neodev.lua
+++ /dev/null
@@ -1,14 +0,0 @@
----@type LazyPluginSpec
-local M = {
-	"folke/neodev.nvim",
-	opts = {
-		override = function(root_dir, library)
-			if root_dir:match("dotfiles") then
-				library.enabled = true
-				library.plugins = true
-			end
-		end,
-	},
-}
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/dap/configs.lua b/nvim/.config/nvim/lua/tobyvin/dap/configs.lua
index 7f8b47d..44f2035 100644
--- a/nvim/.config/nvim/lua/tobyvin/dap/configs.lua
+++ b/nvim/.config/nvim/lua/tobyvin/dap/configs.lua
@@ -26,7 +26,11 @@ local M = {
 			type = "codelldb",
 			request = "launch",
 			program = function()
-				return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+				return vim.fn.input({
+					prompt = "Path to executable: ",
+					text = vim.fn.getcwd() .. "/",
+					completion = "file",
+				})
 			end,
 			cwd = "${workspaceFolder}",
 			stopOnEntry = false,
@@ -39,7 +43,11 @@ local M = {
 			type = "codelldb",
 			request = "launch",
 			program = function()
-				return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file")
+				return vim.fn.input({
+					prompt = "Path to executable: ",
+					text = vim.fn.getcwd() .. "/",
+					completion = "file",
+				})
 			end,
 			cwd = "${workspaceFolder}",
 			stopOnEntry = false,
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
index 94348ff..a5c8f2b 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
@@ -59,11 +59,6 @@ local M = {
 				completion = {
 					callSnippet = "Replace",
 				},
-				diagnostics = {
-					globals = {
-						"vim",
-					},
-				},
 				format = {
 					enable = false,
 				},