nvim: change cutlass suite

and fix telescope + cmp issues

1 files changed, 56 insertions, 19 deletions

diff --git a/.config/nvim/lua/plugins/cutlass.lua b/.config/nvim/lua/plugins/cutlass.lua
index 0b8ef52..b9332a9 100644
--- a/.config/nvim/lua/plugins/cutlass.lua
+++ b/.config/nvim/lua/plugins/cutlass.lua
@@ -3,26 +3,36 @@ return {
         'svermeulen/vim-cutlass',
     },
     {
-        'svermeulen/vim-subversive',
+        'gbprod/substitute.nvim',
         config = function()
             local map = require("helpers.keys").map
 
-            -- substitute from yank
-            map('n', '<Leader>ys', '<plug>(SubversiveSubstitute)', "substitute from yank")
-            map('n', '<Leader>yss', '<plug>(SubversiveSubstituteLine)', "substitute from yank, line")
-            map('n', '<Leader>yS', '<plug>(SubversiveSubstituteToEndOfLine)', "substitute from yank, eol")
+            map("n", "s", require('substitute').operator, "substitute")
+            map("n", "ss", require('substitute').line, "substitute: linewise")
+            map("n", "S", require('substitute').eol, "substitute: eol")
+            map("x", "s", require('substitute').visual, "substitute: visual")
 
-            -- substitute over range
-            map( { 'n', 'x' }, '<Leader>s', '<plug>(SubversiveSubstituteRange)', "start substitude over range")
-            map('n', '<Leader>ss', '<plug>(SubversiveSubstituteWordRange)', "start substitude over range")
-        end
+            map("n", "<leader>s", require('substitute.range').operator, "substitute: over range")
+            map("x", "<leader>s", require('substitute.range').visual, "substitute: over visual")
+            map("n", "<leader>ss", require('substitute.range').word, "substitute: with word over range")
+
+            map("n", "sx", require('substitute.exchange').operator, "exchange")
+            map("n", "sxx", require('substitute.exchange').line, "exchange line")
+            map("x", "sX", require('substitute.exchange').visual, "exchange visual")
+            map("n", "sxc", require('substitute.exchange').cancel, "exchange cancel")
+
+            require("substitute").setup({
+                highlight_substituted_text = {
+                    enabled = true,
+                    timer = 300,
+                },
+            })
+        end,
     },
     {
-        'svermeulen/vim-yoink',
+        "gbprod/yanky.nvim",
         config = function()
-            vim.g.yoinkIncludeDeleteOperations = 1
-
-            -- fix the Target STRING not available
+            -- fix Target STRING not available
             vim.g.clipboard = {
                 name = 'xsel_override',
                 copy = {
@@ -38,14 +48,41 @@ return {
 
             local map = require("helpers.keys").map
 
-            -- yoink paste
-            map('n', 'p', '<Plug>(YoinkPaste_p)')
-            map('n', 'P', '<Plug>(YoinkPaste_P)')
+            map({ "n", "x" }, 'p', '<Plug>(YankyPutAfter)')
+            map({ "n", "x" }, 'P', '<Plug>(YankyPutBefore)')
+
+            map("n", "<c-n>", "<Plug>(YankyCycleForward)")
+            map("n", "<c-p>", "<Plug>(YankyCycleBackward)")
 
-            -- iterate over yank list
-            map('n', '<c-n>', '<Plug>(YoinkPostPasteSwapBack)')
-            map('n', '<c-p>', '<Plug>(YoinkPostPasteSwapForward)')
+            local utils = require("yanky.utils")
+            local mapping = require("yanky.telescope.mapping")
+
+            require("yanky").setup({
+                ring = {
+                    history_length = 100,
+                    storage = "shada",
+                    sync_with_numbered_registers = true,
+                    cancel_event = "update",
+                    ignore_registers = { "_" },
+                },
+                system_clipboard = {
+                    sync_with_ring = true,
+                },
+                picker = {
+                    telescope = {
+                        use_default_mappings = false,
+                        mappings = {
+                            default = mapping.set_register(utils.get_default_register()),
+                        },
+                    },
+                },
+                highlight = {
+                    on_put = true,
+                    on_yank = true,
+                    timer = 300,
+                },
 
+            })
         end,
     }
 }