From c800b66cbf638a70c5fe1e9bff6aad65c5ae3da8 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Mon, 6 Mar 2023 22:35:57 +0530 Subject: [PATCH] nvim: plugins: Switch to nvim-various-textobjs We never really used the comment text object and functionality of the other two are provided in nvim-various-textobjs. --- nvim/.config/nvim/after/plugin/various-textobjs.lua | 8 ++++++++ nvim/.config/nvim/after/plugin/word-column.vim | 10 ---------- nvim/.config/nvim/lua/plugins.lua | 5 +---- 3 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 nvim/.config/nvim/after/plugin/various-textobjs.lua delete mode 100644 nvim/.config/nvim/after/plugin/word-column.vim diff --git a/nvim/.config/nvim/after/plugin/various-textobjs.lua b/nvim/.config/nvim/after/plugin/various-textobjs.lua new file mode 100644 index 0000000..9837790 --- /dev/null +++ b/nvim/.config/nvim/after/plugin/various-textobjs.lua @@ -0,0 +1,8 @@ +require("various-textobjs").setup({ useDefaultKeymaps = false }) + +vim.keymap.set({"o", "x"}, "ae", function () require("various-textobjs").entireBuffer() end) +vim.keymap.set({"o", "x"}, "ii", function () require("various-textobjs").indentation(true, true) end) +vim.keymap.set({"o", "x"}, "ai", function () require("various-textobjs").indentation(false, true) end) +vim.keymap.set({"o", "x"}, "as", function () require("various-textobjs").subword(false) end) +vim.keymap.set({"o", "x"}, "is", function () require("various-textobjs").subword(true) end) +vim.keymap.set({"o", "x"}, "?" , function () require("various-textobjs").toNextClosingBracket() end) diff --git a/nvim/.config/nvim/after/plugin/word-column.vim b/nvim/.config/nvim/after/plugin/word-column.vim deleted file mode 100644 index 4a5d85c..0000000 --- a/nvim/.config/nvim/after/plugin/word-column.vim +++ /dev/null @@ -1,10 +0,0 @@ -call textobj#user#map('wordcolumn', { - \ 'word' : { - \ 'select-i' : 'is', - \ 'select-a' : 'as', - \ }, - \ 'WORD' : { - \ 'select-i' : 'iS', - \ 'select-a' : 'aS', - \ }, - \ }) diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index c05d38c..7207f4b 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -14,10 +14,7 @@ require "paq" { 'https://gitlab.com/yorickpeterse/nvim-pqf', 'wellle/targets.vim' , 'tpope/vim-surround' , - 'chaoren/vim-wordmotion' , - 'kana/vim-textobj-user' , - 'idbrii/textobj-word-column.vim' , - 'glts/vim-textobj-comment' , + 'chrisgrieser/nvim-various-textobjs' , 'numToStr/Comment.nvim' , 'tpope/vim-repeat' , 'tpope/vim-sleuth' ,