From 2fcda354a97c26ab142805fd138cbee199bc4e46 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Thu, 4 Jan 2024 23:20:25 +0000
Subject: [PATCH] argh

---
 vim/.vim/lua/plugins/base.lua       | 16 -----------
 vim/.vim/lua/plugins/bufferline.lua | 27 -------------------
 vim/.vim/lua/plugins/git.lua        | 18 ++++++-------
 vim/.vim/lua/plugins/scroll.lua     | 42 +++++++++++++++++++++++++++++
 vim/.vim/lua/plugins/signify.lua    | 12 ++++++++-
 5 files changed, 61 insertions(+), 54 deletions(-)
 create mode 100644 vim/.vim/lua/plugins/scroll.lua

diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua
index af8123b..b87938e 100644
--- a/vim/.vim/lua/plugins/base.lua
+++ b/vim/.vim/lua/plugins/base.lua
@@ -14,22 +14,6 @@ return {
 			require("presence").setup({ show_time = false })
 		end,
 	},
-	{
-		"petertriho/nvim-scrollbar",
-		config = function()
-			require("scrollbar").setup()
-		end,
-		lazy = false,
-	},
-	{
-		"kevinhwang91/nvim-hlslens",
-		config = function()
-			-- require('hlslens').setup() is not required
-			require("scrollbar.handlers.search").setup({
-				-- hlslens config overrides
-			})
-		end,
-	},
 	{ "udalov/kotlin-vim", ft = "kotlin" },
 	{ "ray-x/go.nvim", ft = "go" },
 	{ "ray-x/guihua.lua", ft = "go" },
diff --git a/vim/.vim/lua/plugins/bufferline.lua b/vim/.vim/lua/plugins/bufferline.lua
index d79ef4e..8dab363 100644
--- a/vim/.vim/lua/plugins/bufferline.lua
+++ b/vim/.vim/lua/plugins/bufferline.lua
@@ -44,33 +44,6 @@ return {
 						local icon = symbols[level] or level
 						return "" .. icon .. count
 					end,
-					custom_areas = {
-						left = function()
-							local result = {}
-							local seve = vim.diagnostic.severity
-							local error = #vim.diagnostic.get(0, { severity = seve.ERROR })
-							local warning = #vim.diagnostic.get(0, { severity = seve.WARN })
-							local info = #vim.diagnostic.get(0, { severity = seve.INFO })
-							local hint = #vim.diagnostic.get(0, { severity = seve.HINT })
-
-							if error ~= 0 then
-								table.insert(result, { text = " " .. error, fg = "#EC5241" })
-							end
-
-							if warning ~= 0 then
-								table.insert(result, { text = "  " .. warning, fg = "#EFB839" })
-							end
-
-							if hint ~= 0 then
-								table.insert(result, { text = "󱠂 " .. hint, fg = "#A3BA5E" })
-							end
-
-							if info ~= 0 then
-								table.insert(result, { text = " " .. info, fg = "#7EA9A7" })
-							end
-							return result
-						end,
-					},
 					max_name_length = 30,
 					truncate_name = false,
 					show_close_icon = false,
diff --git a/vim/.vim/lua/plugins/git.lua b/vim/.vim/lua/plugins/git.lua
index e49ccb0..9539c38 100644
--- a/vim/.vim/lua/plugins/git.lua
+++ b/vim/.vim/lua/plugins/git.lua
@@ -1,15 +1,13 @@
 return {
 	-- Git
-	{
-		"lewis6991/gitsigns.nvim",
-		dependencies = "nvim-lua/plenary.nvim",
-		event = "VimEnter",
-		config = function()
-			require("gitsigns").setup()
-			-- also show signs in scrollbar
-			require("scrollbar.handlers.gitsigns").setup()
-		end,
-	},
+	-- {
+	-- 	"lewis6991/gitsigns.nvim",
+	-- 	dependencies = "nvim-lua/plenary.nvim",
+	-- 	event = "VimEnter",
+	-- 	config = function()
+	-- 		require("gitsigns").setup()
+	-- 	end,
+	-- },
 	{
 		"akinsho/git-conflict.nvim",
 		version = "*",
diff --git a/vim/.vim/lua/plugins/scroll.lua b/vim/.vim/lua/plugins/scroll.lua
new file mode 100644
index 0000000..402e71a
--- /dev/null
+++ b/vim/.vim/lua/plugins/scroll.lua
@@ -0,0 +1,42 @@
+return {
+	-- {
+	-- 	"dstein64/nvim-scrollview",
+	-- 	config = function()
+	-- 		require("scrollview").setup({
+	-- 			excluded_filetypes = { "nerdtree" },
+	-- 			current_only = true,
+	-- 			-- base = "buffer",
+	-- 			-- column = 80,
+	-- 			signs_on_startup = { "all" },
+	-- 			diagnostics_severities = { vim.diagnostic.severity.ERROR },
+	-- 		})
+	-- 	end,
+	-- },
+
+	{
+		"petertriho/nvim-scrollbar",
+		config = function()
+			require("scrollbar").setup({
+				show_in_active_only = true,
+				excluded_filetypes = {
+					"cmp_docs",
+					"cmp_menu",
+					"noice",
+					"prompt",
+					"TelescopePrompt",
+					"neo-tree",
+				},
+			})
+		end,
+		lazy = false,
+	},
+	{
+		"kevinhwang91/nvim-hlslens",
+		config = function()
+			-- require('hlslens').setup() is not required
+			require("scrollbar.handlers.search").setup({
+				-- hlslens config overrides
+			})
+		end,
+	},
+}
diff --git a/vim/.vim/lua/plugins/signify.lua b/vim/.vim/lua/plugins/signify.lua
index 2b26e87..7a94210 100644
--- a/vim/.vim/lua/plugins/signify.lua
+++ b/vim/.vim/lua/plugins/signify.lua
@@ -59,6 +59,16 @@ return {
 	config = function()
 		vim.g.signify_vcs_list = { "hg", "git" }
 		-- vim.g.signify_sign_change = "*"
-		vim.g.signify_sign_delete = "-"
+		-- vim.g.signify_sign_delete = "-"
+		-- vim.g.signify_line_highlight = 0
+		vim.g.signify_sign_add = "┃"
+		vim.g.signify_sign_delete = "┃"
+		vim.g.signify_sign_change = "┃"
+		vim.api.nvim_set_hl(0, "SignifySignAdd", { ctermfg = "green", fg = "#79b7a5" })
+		vim.api.nvim_set_hl(0, "SignifySignChange", { ctermfg = "yellow", fg = "#ffffcc" })
+		vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { ctermfg = "red", fg = "#ff7b72" })
+		vim.api.nvim_set_hl(0, "SignifySignDelete", { ctermfg = "red", fg = "#ff7b72" })
+		vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { ctermfg = "red", fg = "#ff7b72" })
+		-- vim.cmd("highlight SignColumn ctermbg=NONE cterm=NONE guibg=NONE gui=NONE")
 	end,
 }