From c1a592a787b220f56c034c3473cf17bbf7ec9771 Mon Sep 17 00:00:00 2001
From: Luca Bilke <luca@bil.ke>
Date: Sat, 9 Mar 2024 02:48:53 +0100
Subject: [PATCH] nvim cleanup

---
 .config/nvim/lua/config/lsp.lua            | 13 +++++++++++--
 .config/nvim/lua/plugins/lsp/init.lua      |  2 +-
 .config/nvim/lua/plugins/lsp/lspconfig.lua |  7 -------
 3 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 .config/nvim/lua/plugins/lsp/lspconfig.lua

diff --git a/.config/nvim/lua/config/lsp.lua b/.config/nvim/lua/config/lsp.lua
index 177144d40..ae3fe7764 100644
--- a/.config/nvim/lua/config/lsp.lua
+++ b/.config/nvim/lua/config/lsp.lua
@@ -1,4 +1,4 @@
-local conf = { handlers = {}, required = {} }
+local conf = { handlers = {} }
 
 conf.handlers["intelephense"] = {
 	init_options = {
@@ -16,7 +16,16 @@ conf.handlers["bashls"] = {
 	},
 }
 
-conf.required = { "lua_ls", "zk", "bashls" }
+conf.required = {
+		"zk",
+		"jsonls",
+		"yamlls",
+		"lua_ls",
+		"bashls",
+		"ansiblels",
+		"dockerls",
+}
+
 
 conf.ignore = { "rust_analyzer" } -- This will be setup by rustacean.nvim
 return conf
diff --git a/.config/nvim/lua/plugins/lsp/init.lua b/.config/nvim/lua/plugins/lsp/init.lua
index 5988efc7f..096c4639d 100644
--- a/.config/nvim/lua/plugins/lsp/init.lua
+++ b/.config/nvim/lua/plugins/lsp/init.lua
@@ -1,7 +1,7 @@
 return {
+	{ "neovim/nvim-lspconfig" },
 	{ "folke/neoconf.nvim", config = true },
 	{ "folke/neodev.nvim", config = true },
-	require("plugins.lsp.lspconfig"),
 	require("plugins.lsp.mason"),
 	require("plugins.lsp.mason-lspconfig"),
 	require("plugins.lsp.mason-null-ls"),
diff --git a/.config/nvim/lua/plugins/lsp/lspconfig.lua b/.config/nvim/lua/plugins/lsp/lspconfig.lua
deleted file mode 100644
index 976893764..000000000
--- a/.config/nvim/lua/plugins/lsp/lspconfig.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local M = { "neovim/nvim-lspconfig" }
-
-M.dependencies = { "mason-lspconfig.nvim", "neoconf.nvim", "neodev.nvim" }
-
-M.event = { "BufReadPost", "BufNewFile", "BufNew" }
-
-return M