From ef6089dda9438aef403e6f364b68e1cb0263f6a5 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Sat, 20 Jan 2024 01:54:29 -0600
Subject: [PATCH] organize lsp stuff

---
 vim/.vim/lua/plugins/base.lua        | 14 +-------------
 vim/.vim/lua/plugins/diagnostics.lua | 23 -----------------------
 vim/.vim/lua/plugins/lsp.lua         | 19 +++++++++++++++++++
 3 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua
index 66ee9f8..eb37519 100644
--- a/vim/.vim/lua/plugins/base.lua
+++ b/vim/.vim/lua/plugins/base.lua
@@ -8,7 +8,7 @@ return {
 	"AndrewRadev/tagalong.vim",
 	{ "nvim-lua/plenary.nvim", lazy = false },
 	{ "squk/java-syntax.vim", ft = "java" },
-	{ "udalov/kotlin-vim", ft = "kotlin" },
+	{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
 	{ "ray-x/go.nvim", ft = "go" },
 	{ "ray-x/guihua.lua", ft = "go" },
 	{ "andymass/vim-matchup", event = "VimEnter" },
@@ -39,18 +39,6 @@ return {
 			})
 		end,
 	},
-	{
-		"kosayoda/nvim-lightbulb",
-		opts = {
-			autocmd = { enabled = true },
-			virtual_text = {
-				enabled = true,
-				text = " 󱐋",
-				hl = "DiagnosticWarn",
-			},
-			sign = { enabled = false },
-		},
-	},
 	{
 		"ntpeters/vim-better-whitespace",
 		config = function()
diff --git a/vim/.vim/lua/plugins/diagnostics.lua b/vim/.vim/lua/plugins/diagnostics.lua
index 0c2b4c0..e3837bc 100644
--- a/vim/.vim/lua/plugins/diagnostics.lua
+++ b/vim/.vim/lua/plugins/diagnostics.lua
@@ -1,11 +1,4 @@
 return {
-	{
-		"luozhiya/lsp-virtual-improved.nvim",
-		event = { "LspAttach" },
-		config = function()
-			require("lsp-virtual-improved").setup()
-		end,
-	},
 	{
 		"folke/trouble.nvim",
 		event = { "LspAttach" },
@@ -41,22 +34,6 @@ return {
 				vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
 			end
 
-			-- local colors = {
-			-- 	Error = { primary = "#f28b82", secondary = "#ab0101", invert = true },
-			-- 	Warning = { primary = "#f2b066", secondary = "#ab7a00", invert = false },
-			-- 	Hint = { primary = "#b4f9f8", secondary = "#008080", invert = true },
-			-- 	Info = { primary = "#abf2b0", secondary = "#008080", invert = true },
-			-- 	Other = { primary = "#abf2b0", secondary = "#008080", invert = true },
-			-- }
-			-- for type, colorpair in pairs(colors) do
-			-- 	local hl = "DiagnosticVirtualText" .. type
-			-- 	if not colorpair.invert then
-			-- 		vim.api.nvim_set_hl(0, hl, { fg = colorpair.primary, bg = colorpair.secondary })
-			-- 	else
-			-- 		vim.api.nvim_set_hl(0, hl, { fg = colorpair.secondary, bg = colorpair.primary })
-			-- 	end
-			-- end
-
 			require("lsp_lines").setup()
 
 			vim.schedule(function()
diff --git a/vim/.vim/lua/plugins/lsp.lua b/vim/.vim/lua/plugins/lsp.lua
index a6c1371..a97e379 100644
--- a/vim/.vim/lua/plugins/lsp.lua
+++ b/vim/.vim/lua/plugins/lsp.lua
@@ -9,6 +9,25 @@ local deps = {
 }
 
 return {
+	{
+		"luozhiya/lsp-virtual-improved.nvim",
+		event = { "LspAttach" },
+		config = function()
+			require("lsp-virtual-improved").setup()
+		end,
+	},
+	{
+		"kosayoda/nvim-lightbulb",
+		opts = {
+			autocmd = { enabled = true },
+			virtual_text = {
+				enabled = true,
+				text = " 󱐋",
+				hl = "DiagnosticWarn",
+			},
+			sign = { enabled = false },
+		},
+	},
 	{
 		"L3MON4D3/LuaSnip",
 		build = "make install_jsregexp",