3 files changed, 27 insertions, 24 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua
index 20d7822..a8f6cd8 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua
@@ -224,12 +224,9 @@ M.plugins = function(use)
 	})
 
 	use({
-		"AckslD/nvim-neoclip.lua",
-		requires = {
-			"nvim-telescope/telescope.nvim",
-		},
+		"gbprod/yanky.nvim",
 		config = function()
-			require("tobyvin.plugins.neoclip").setup()
+			require("tobyvin.plugins.yanky").setup()
 		end,
 	})
 
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/neoclip.lua b/nvim/.config/nvim/lua/tobyvin/plugins/neoclip.lua
deleted file mode 100644
index 8dc4cbd..0000000
--- a/nvim/.config/nvim/lua/tobyvin/plugins/neoclip.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local M = {}
-
-M.setup = function()
-	local status_ok, neoclip = pcall(require, "neoclip")
-	if not status_ok then
-		vim.notify("Failed to load module 'neoclip'", "error")
-		return
-	end
-
-	neoclip.setup()
-
-	local telescope = require("telescope")
-	telescope.load_extension("neoclip")
-
-	vim.keymap.set("n", "fy", telescope.extensions.neoclip.default, { desc = "Yank History" })
-	vim.keymap.set("n", "fM", telescope.extensions.macroscope.default, { desc = "Macro History" })
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/yanky.lua b/nvim/.config/nvim/lua/tobyvin/plugins/yanky.lua
new file mode 100644
index 0000000..cd9a52b
--- /dev/null
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/yanky.lua
@@ -0,0 +1,25 @@
+local M = {}
+
+M.setup = function()
+	local status_ok, yanky = pcall(require, "yanky")
+	if not status_ok then
+		vim.notify("Failed to load module 'yanky'", "error")
+		return
+	end
+
+	yanky.setup({
+		highlight = {
+			on_put = false,
+			on_yank = false,
+		},
+		preserve_cursor_position = {
+			enabled = false,
+		},
+	})
+
+	local picker = require("yanky.picker")
+	picker.setup()
+	vim.keymap.set({ "n", "x" }, "<C-p>", picker.select_in_history, { desc = "Yank History" })
+end
+
+return M