From d925f8ca0d108f775f57bde30aaf5c51390c356a Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Mon, 30 Jun 2025 17:19:24 +0200 Subject: [PATCH] nvim: remove unused wrapper --- config/nvim/lua/fschauen/keymap.lua | 116 +++++++++++++--------------- 1 file changed, 54 insertions(+), 62 deletions(-) diff --git a/config/nvim/lua/fschauen/keymap.lua b/config/nvim/lua/fschauen/keymap.lua index 9b52925..38dc640 100644 --- a/config/nvim/lua/fschauen/keymap.lua +++ b/config/nvim/lua/fschauen/keymap.lua @@ -1,113 +1,105 @@ local M = {} -local map = function(mode, lhs, rhs, opts) - if mode ~= "c" then - opts = opts or {} - opts.silent = opts.silent ~= false -- silent by default - end - vim.keymap.set(mode, lhs, rhs, opts) -end - -- stylua: ignore start M.setup = function() -- better navigation for wrapped lines - map("n", "j", "gj") - map("n", "k", "gk") + vim.keymap.set("n", "j", "gj") + vim.keymap.set("n", "k", "gk") -- maintain cursor position when joining lines - map("n", "J", "mzJ`z") + vim.keymap.set("n", "J", "mzJ`z") -- retain selection when making changes in visual mode - map("v", "", "gv") - map("v", "", "gv") - map("v", "g", "ggv") - map("v", "g", "ggv") - map("v", ">", ">gv") - map("v", "<", "<gv") + vim.keymap.set("v", "", "gv") + vim.keymap.set("v", "", "gv") + vim.keymap.set("v", "g", "ggv") + vim.keymap.set("v", "g", "ggv") + vim.keymap.set("v", ">", ">gv") + vim.keymap.set("v", "<", "<gv") -- place destination of important movements in the center of the screen - map("n", "n", "nzzzv") - map("n", "N", "Nzzzv") - map("n", "*", "*zzzv") - map("n", "#", "#zzzv") - map("n", "g*", "g*zzzv") - map("n", "g#", "g#zzzv") - map("n", "", "zzzv") - map("n", "", "zzzv") + vim.keymap.set("n", "n", "nzzzv") + vim.keymap.set("n", "N", "Nzzzv") + vim.keymap.set("n", "*", "*zzzv") + vim.keymap.set("n", "#", "#zzzv") + vim.keymap.set("n", "g*", "g*zzzv") + vim.keymap.set("n", "g#", "g#zzzv") + vim.keymap.set("n", "", "zzzv") + vim.keymap.set("n", "", "zzzv") -- easier window navigation - map("n", "", "j") - map("n", "", "k") - map("n", "", "h") - map("n", "", "l") + vim.keymap.set("n", "", "j") + vim.keymap.set("n", "", "k") + vim.keymap.set("n", "", "h") + vim.keymap.set("n", "", "l") -- disable highlight until next search - map("n", "h", "nohlsearch") + vim.keymap.set("n", "h", "nohlsearch") local window = require("fschauen.util.window") -- window resizing - map("n", "", window.resize_up(2), { desc = "Resize window upward" }) - map("n", "", window.resize_down(2), { desc = "Resize window downward" }) - map("n", "", window.resize_left(2), { desc = "Resize window leftward" }) - map("n", "", window.resize_right(2), { desc = "Resize window rightward" }) + vim.keymap.set("n", "", window.resize_up(2), { desc = "Resize window upward" }) + vim.keymap.set("n", "", window.resize_down(2), { desc = "Resize window downward" }) + vim.keymap.set("n", "", window.resize_left(2), { desc = "Resize window leftward" }) + vim.keymap.set("n", "", window.resize_right(2), { desc = "Resize window rightward" }) -- easy tab navigation - map("n", "", "tabnext") - map("n", "", "tabprevious") + vim.keymap.set("n", "", "tabnext") + vim.keymap.set("n", "", "tabprevious") -- move lines up and down - map("n", "", [[:move .+1==]]) - map("n", "", [[:move .-2==]]) - map("v", "", [[:move '>+1gv=gv]]) - map("v", "", [[:move '<-2gv=gv]]) - map("i", "", [[:move .+1==gi]]) - map("i", "", [[:move .-2==gi]]) + vim.keymap.set("n", "", [[:move .+1==]]) + vim.keymap.set("n", "", [[:move .-2==]]) + vim.keymap.set("v", "", [[:move '>+1gv=gv]]) + vim.keymap.set("v", "", [[:move '<-2gv=gv]]) + vim.keymap.set("i", "", [[:move .+1==gi]]) + vim.keymap.set("i", "", [[:move .-2==gi]]) -- move to begin/end of line in insert mode - map("i", "", "^") - map("i", "", "$") + vim.keymap.set("i", "", "^") + vim.keymap.set("i", "", "$") -- move to begin of line in command mode ( moves to end by default) - map("c", "", "") + vim.keymap.set("c", "", "") -- more convenient way of entering normal mode from terminal mode - map("t", [[]], [[]]) + vim.keymap.set("t", [[]], [[]]) -- recall older/recent command-line from history - map("c", "", "") - map("c", "", "") + vim.keymap.set("c", "", "") + vim.keymap.set("c", "", "") -- trigger InsertLeave when leaving Insert mode with ctrl-c (see :help i_CTRL-C) - map("i", "", "") + vim.keymap.set("i", "", "") -- quickly change background - map("n", "bg", [[let &background = &background ==? "light" ? "dark" : "light"]]) + vim.keymap.set("n", "bg", [[let &background = &background ==? "light" ? "dark" : "light"]]) -- don't loose the original yanked contents when pasting in visual mode - map("x", "p", [["_dP]]) + vim.keymap.set("x", "p", [["_dP]]) local diagnostic = require("fschauen.diagnostic") local ui = require("fschauen.util.icons").ui -- navigate diagnostics - map("n", "dd", diagnostic.toggle, { desc = ui.Diagnostic.." [d]iagnostic enable/[d]isable" }) - map("n", "do", diagnostic.open_float, { desc = ui.Diagnostic.." [d]iagnostic [o]pen" }) - map("n", "dh", diagnostic.hide, { desc = ui.Diagnostic.." [d]iagnostic [h]ide" }) - map("n", "ds", diagnostic.set_severity, { desc = ui.Diagnostic.." [d]iagnostic [s]everity" }) + vim.keymap.set("n", "dd", diagnostic.toggle, { desc = ui.Diagnostic.." [d]iagnostic enable/[d]isable" }) + vim.keymap.set("n", "do", diagnostic.open_float, { desc = ui.Diagnostic.." [d]iagnostic [o]pen" }) + vim.keymap.set("n", "dh", diagnostic.hide, { desc = ui.Diagnostic.." [d]iagnostic [h]ide" }) + vim.keymap.set("n", "ds", diagnostic.set_severity, { desc = ui.Diagnostic.." [d]iagnostic [s]everity" }) -- toggle quickfix and loclist - map("n", "q", window.toggle_quickfix, { desc = ui.Toggle.." toggle quickfix" }) - map("n", "q", window.toggle_loclist, { desc = ui.Toggle.." toggle loclist" }) + vim.keymap.set("n", "q", window.toggle_quickfix, { desc = ui.Toggle.." toggle quickfix" }) + vim.keymap.set("n", "q", window.toggle_loclist, { desc = ui.Toggle.." toggle loclist" }) local options = require("fschauen.util.options") -- toggle options - map("n", "sn", options.toggle_number, { desc = ui.Toggle.." toggle 'number'" }) - map("n", "sr", options.toggle_relativenumber, { desc = ui.Toggle.." toggle 'relativenumber'" }) - map("n", "sl", options.toggle_list, { desc = ui.Toggle.." toggle 'list'" }) - map("n", "sw", options.toggle_wrap, { desc = ui.Toggle.." toggle 'wrap'" }) - map("n", "ss", options.toggle_spell, { desc = ui.Toggle.." toggle 'spell'" }) + vim.keymap.set("n", "sn", options.toggle_number, { desc = ui.Toggle.." toggle 'number'" }) + vim.keymap.set("n", "sr", options.toggle_relativenumber, { desc = ui.Toggle.." toggle 'relativenumber'" }) + vim.keymap.set("n", "sl", options.toggle_list, { desc = ui.Toggle.." toggle 'list'" }) + vim.keymap.set("n", "sw", options.toggle_wrap, { desc = ui.Toggle.." toggle 'wrap'" }) + vim.keymap.set("n", "ss", options.toggle_spell, { desc = ui.Toggle.." toggle 'spell'" }) end -- stylua: ignore end