feat(nvim): add leap.nvim

3 files changed, 28 insertions, 1 deletions

diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua
index 2540d4e..affab4e 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua
@@ -425,7 +425,7 @@ M.plugins = function(use)
 	use({
 		"ggandor/leap.nvim",
 		config = function()
-			require("leap").set_default_keymaps()
+			require("tobyvin.plugins.leap").setup()
 		end,
 	})
 
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/leap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/leap.lua
new file mode 100644
index 0000000..0815358
--- /dev/null
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/leap.lua
@@ -0,0 +1,26 @@
+local M = {}
+
+M.highlights = function()
+	-- vim.api.nvim_set_hl(0, "LeapMatch", { link = "IncSearch" })
+	-- vim.api.nvim_set_hl(0, "LeapLabelSelected", { link = "IncSearch" })
+	vim.api.nvim_set_hl(0, "LeapLabelPrimary", { link = "IncSearch" })
+	-- vim.api.nvim_set_hl(0, "LeapLabelSecondary", { link = "IncSearch" })
+end
+
+M.setup = function()
+	local status_ok, leap = pcall(require, "leap")
+	if not status_ok then
+		vim.notify("Failed to load module 'leap'", "error")
+		return
+	end
+
+	leap.set_default_keymaps()
+
+	M.highlights()
+
+	vim.api.nvim_create_autocmd("ColorScheme", {
+		callback = M.highlights,
+	})
+end
+
+return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/surround.lua b/nvim/.config/nvim/lua/tobyvin/plugins/surround.lua
index d1f3405..a892cd4 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/surround.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/surround.lua
@@ -9,6 +9,7 @@ M.setup = function()
 
 	surround.setup({
 		map_insert_mode = false,
+		prefix = "<C-s>",
 	})
 end