From 1a64536c8f26ce6855dac1b54179e26ac43a540b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Tue, 26 Dec 2023 10:19:51 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nvim):=20make=20y?= =?UTF-8?q?anky=20an=20extra=20module=20that=20imports=20the=20lazyvim=20o?= =?UTF-8?q?ne=20and=20my=20options?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/lazyvim.json | 2 +- .../nvim/lua/plugins/extras/coding/yanky.lua | 39 +++++++++++++++++++ .config/nvim/lua/plugins/yanky.lua | 33 ---------------- 3 files changed, 40 insertions(+), 34 deletions(-) create mode 100644 .config/nvim/lua/plugins/extras/coding/yanky.lua delete mode 100644 .config/nvim/lua/plugins/yanky.lua diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 45d6d9a6..07166dd8 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -1,6 +1,5 @@ { "extras": [ - "lazyvim.plugins.extras.coding.yanky", "lazyvim.plugins.extras.formatting.black", "lazyvim.plugins.extras.lang.python-semshi", "lazyvim.plugins.extras.lang.yaml", @@ -18,6 +17,7 @@ "plugins.extras.coding.treesitter.node-action", "plugins.extras.coding.treesitter.puppeteer", "plugins.extras.coding.treesitter.text-case", + "plugins.extras.coding.yanky", "plugins.extras.dap.core", "plugins.extras.dap.persistent-breakpoints", "plugins.extras.editor.color", diff --git a/.config/nvim/lua/plugins/extras/coding/yanky.lua b/.config/nvim/lua/plugins/extras/coding/yanky.lua new file mode 100644 index 00000000..89f871d2 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/coding/yanky.lua @@ -0,0 +1,39 @@ +return { + { + import = "lazyvim.plugins.extras.coding.yanky", + }, + { + "gbprod/yanky.nvim", + opts = function(_, opts) + local utils = require("yanky.utils") + local mapping = require("yanky.telescope.mapping") + + opts.highlight = { timer = 250 } + opts.ring = { storage = jit.os:find("Windows") and "shada" or "sqlite" } + opts.picker = { + telescope = { + use_default_mappings = false, + mappings = { + default = mapping.put("p"), + i = { + [""] = mapping.put("p"), + [""] = mapping.put("P"), + [""] = mapping.delete(), + [""] = mapping.set_register(utils.get_default_register()), + }, + n = { + p = mapping.put("p"), + P = mapping.put("P"), + d = mapping.delete(), + r = mapping.set_register(utils.get_default_register()), + }, + }, + }, + } + end, + -- stylua: ignore + keys = { + {"sy", function() require("telescope").extensions.yank_history.yank_history({}) end, mode = {"n", "v"}, desc = "Yank History"}, + }, + }, +} diff --git a/.config/nvim/lua/plugins/yanky.lua b/.config/nvim/lua/plugins/yanky.lua deleted file mode 100644 index ea52200a..00000000 --- a/.config/nvim/lua/plugins/yanky.lua +++ /dev/null @@ -1,33 +0,0 @@ -local utils = require("yanky.utils") -local mapping = require("yanky.telescope.mapping") - -return { - "gbprod/yanky.nvim", - optional = true, - opts = { - picker = { - telescope = { - use_default_mappings = false, - mappings = { - default = mapping.put("p"), - i = { - [""] = mapping.put("p"), - [""] = mapping.put("P"), - [""] = mapping.delete(), - [""] = mapping.set_register(utils.get_default_register()), - }, - n = { - p = mapping.put("p"), - P = mapping.put("P"), - d = mapping.delete(), - r = mapping.set_register(utils.get_default_register()), - }, - }, - }, - }, - }, - -- stylua: ignore - keys = { - {"sy", function() require("telescope").extensions.yank_history.yank_history({}) end, mode = {"n", "v"}, desc = "Yank History"}, - }, -}