From df15c25cd5ffe0ea8cac458e4d5abfe42bdc5388 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Thu, 4 Jan 2024 22:56:04 +0000
Subject: [PATCH] Fix scrollbar

---
 config/.config/nvim/lazy-lock.json       | 1 +
 vim/.vim/lua/plugins/base.lua            | 9 +++++++++
 vim/.vim/lua/plugins/git.lua             | 7 ++++++-
 vim/.vim/lua/plugins/nvim-treesitter.lua | 2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 9b4f903..92cc8ab 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -67,6 +67,7 @@
   "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" },
   "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" },
   "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" },
+  "nvim-hlslens": { "branch": "main", "commit": "8ffc64bb6b624612cf762982b92633f283f7a715" },
   "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" },
   "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
   "nvim-lint": { "branch": "master", "commit": "d44185d3e57e00c164485a454174294b36ef7067" },
diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua
index 57863d3..af8123b 100644
--- a/vim/.vim/lua/plugins/base.lua
+++ b/vim/.vim/lua/plugins/base.lua
@@ -21,6 +21,15 @@ return {
 		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/git.lua b/vim/.vim/lua/plugins/git.lua
index d5ada31..e49ccb0 100644
--- a/vim/.vim/lua/plugins/git.lua
+++ b/vim/.vim/lua/plugins/git.lua
@@ -3,7 +3,12 @@ return {
 	{
 		"lewis6991/gitsigns.nvim",
 		dependencies = "nvim-lua/plenary.nvim",
-		event = "User ActuallyEditing",
+		event = "VimEnter",
+		config = function()
+			require("gitsigns").setup()
+			-- also show signs in scrollbar
+			require("scrollbar.handlers.gitsigns").setup()
+		end,
 	},
 	{
 		"akinsho/git-conflict.nvim",
diff --git a/vim/.vim/lua/plugins/nvim-treesitter.lua b/vim/.vim/lua/plugins/nvim-treesitter.lua
index 9ad6cfd..e4ed3cb 100644
--- a/vim/.vim/lua/plugins/nvim-treesitter.lua
+++ b/vim/.vim/lua/plugins/nvim-treesitter.lua
@@ -57,7 +57,7 @@ return {
 							return true
 						end
 
-						local max_filesize = 100 * 1024 -- 200 KB
+						local max_filesize = 200 * 1024 -- 200 KB
 						local fname = vim.api.nvim_buf_get_name(buf)
 						local ok, stats = pcall(vim.loop.fs_stat, fname)
 						if ok and stats and stats.size > max_filesize then