nvim: bring in leap.nvim, vim.keymap.set

1 files changed, 16 insertions, 30 deletions

diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index a324d90..db2a552 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -5,16 +5,6 @@
 -- │▘▝ ▘▝▀▘▌  ▌  ▀▘▘ ▘▗▄▘▀▀ │
 -- └────────────────────────┘
 
--- -- map helper
--- local function map(mode, lhs, rhs, opts)
---   local options = {noremap = true, silent = true}
---   if opts then options = vim.tbl_extend('force', options, opts) end
---   vim.api.nvim_set_keymap(mode, lhs, rhs, options)
--- end
-
--- local cmd = vim.cmd
--- local M = {}
-
 -- brute force deasciify everything
 vim.keymap.set("n", "<leader>tc", "TurkishDeasciifyForce()", { expr = true })
 vim.keymap.set("n", "<leader>tctc", "TurkishDeasciifyForce() .. '_'", { expr = true })
@@ -95,22 +85,11 @@ vim.keymap.set('v', '<', '<gv')
 vim.keymap.set('v', 'y', 'myy`y')
 vim.keymap.set('v', 'Y', 'myY`y')
 
--- plug mappings {{{ --
--- New vim.keymap.set handles Plug mappings, I think, remove this paragraph if nothing breaks in the upcoming days
--- -- <Plug> mappings should not be noremap
--- -- https://www.reddit.com/r/vim/comments/78izt4/please_help_understand_how_to_use_plug_mapping/
--- local function plugmap(mode, lhs, rhs, opts)
---   local options = {noremap = false, silent = true}
---   if opts then options = vim.tbl_extend('force', options, opts) end
---   vim.api.nvim_set_keymap(mode, lhs, rhs, options)
--- end
-
--- sneak using grave, s is for sandwich
-vim.keymap.set('n', '`', '<Plug>Sneak_s')
-vim.keymap.set('n', '`', '<Plug>Sneak_s')
-vim.keymap.set('n', '<Leader>`', '<Plug>Sneak_S')
+-- ` is more useful than `
 vim.keymap.set('n', "'", '`')
 
+-- plug mappings {{{ --
+
 -- use the special yoink paste that rotates
 vim.keymap.set('n', 'p', '<Plug>(YoinkPaste_p)')
 vim.keymap.set('n', 'P', '<Plug>(YoinkPaste_P)')
@@ -162,11 +141,18 @@ vim.keymap.set('n', 'vr', ':NvimTreeRefresh<CR>')
 vim.keymap.set('n', 'vs', ':NvimTreeFindFile<CR>')
 
 -- dial.nvim mappings
-vim.keymap.set("n", "<C-a>", require("dial.map").inc_normal(), {noremap = true})
-vim.keymap.set("n", "<C-x>", require("dial.map").dec_normal(), {noremap = true})
-vim.keymap.set("v", "<C-a>", require("dial.map").inc_visual(), {noremap = true})
-vim.keymap.set("v", "<C-x>", require("dial.map").dec_visual(), {noremap = true})
-vim.keymap.set("v", "g<C-a>", require("dial.map").inc_gvisual(), {noremap = true})
-vim.keymap.set("v", "g<C-x>", require("dial.map").dec_gvisual(), {noremap = true})
+local opts = { noremap=true, silent=true }
+vim.keymap.set("n", "<C-a>", require("dial.map").inc_normal(), opts)
+vim.keymap.set("n", "<C-x>", require("dial.map").dec_normal(), opts)
+vim.keymap.set("v", "<C-a>", require("dial.map").inc_visual(), opts)
+vim.keymap.set("v", "<C-x>", require("dial.map").dec_visual(), opts)
+vim.keymap.set("v", "g<C-a>", require("dial.map").inc_gvisual(), opts)
+vim.keymap.set("v", "g<C-x>", require("dial.map").dec_gvisual(), opts)
+
+-- leap.nvim mappings
+vim.keymap.set('n', '`', '<Plug>(leap-forward)', opts)
+vim.keymap.set('n', '<Leader>`', '<Plug>(leap-backward)', opts)
+vim.keymap.set('v', '`', '<Plug>(leap-forward)', opts)
+vim.keymap.set('v', '<Leader>`', '<Plug>(leap-backward)', opts)
 
 -- }}} plug mappings --