fernando/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

nvim: remove unused wrapper

Browse source
This commit is contained in:
Fernando Schauenburg 2025-06-30 17:19:24 +02:00
parent b70bbbc582
commit d925f8ca0d
1 changed files with 54 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
config/nvim/lua/fschauen/keymap.lua
View file

@ -1,113 +1,105 @@
local M = {} 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 -- stylua: ignore start
M.setup = function() M.setup = function()
-- better navigation for wrapped lines -- better navigation for wrapped lines
map("n", "j", "gj") vim.keymap.set("n", "j", "gj")
map("n", "k", "gk") vim.keymap.set("n", "k", "gk")
-- maintain cursor position when joining lines -- 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 -- retain selection when making changes in visual mode
map("v", "<c-a>", "<c-a>gv") vim.keymap.set("v", "<c-a>", "<c-a>gv")
map("v", "<c-x>", "<c-x>gv") vim.keymap.set("v", "<c-x>", "<c-x>gv")
map("v", "g<c-a>", "g<c-a>gv") vim.keymap.set("v", "g<c-a>", "g<c-a>gv")
map("v", "g<c-x>", "g<c-x>gv") vim.keymap.set("v", "g<c-x>", "g<c-x>gv")
map("v", ">", "><cr>gv") vim.keymap.set("v", ">", "><cr>gv")
map("v", "<", "<<cr>gv") vim.keymap.set("v", "<", "<<cr>gv")
-- place destination of important movements in the center of the screen -- place destination of important movements in the center of the screen
map("n", "n", "nzzzv") vim.keymap.set("n", "n", "nzzzv")
map("n", "N", "Nzzzv") vim.keymap.set("n", "N", "Nzzzv")
map("n", "*", "*zzzv") vim.keymap.set("n", "*", "*zzzv")
map("n", "#", "#zzzv") vim.keymap.set("n", "#", "#zzzv")
map("n", "g*", "g*zzzv") vim.keymap.set("n", "g*", "g*zzzv")
map("n", "g#", "g#zzzv") vim.keymap.set("n", "g#", "g#zzzv")
map("n", "<c-d>", "<c-d>zzzv") vim.keymap.set("n", "<c-d>", "<c-d>zzzv")
map("n", "<c-u>", "<c-u>zzzv") vim.keymap.set("n", "<c-u>", "<c-u>zzzv")
-- easier window navigation -- easier window navigation
map("n", "<c-j>", "<c-w>j") vim.keymap.set("n", "<c-j>", "<c-w>j")
map("n", "<c-k>", "<c-w>k") vim.keymap.set("n", "<c-k>", "<c-w>k")
map("n", "<c-h>", "<c-w>h") vim.keymap.set("n", "<c-h>", "<c-w>h")
map("n", "<c-l>", "<c-w>l") vim.keymap.set("n", "<c-l>", "<c-w>l")
-- disable highlight until next search -- disable highlight until next search
map("n", "<leader>h", "<cmd>nohlsearch<cr>") vim.keymap.set("n", "<leader>h", "<cmd>nohlsearch<cr>")
local window = require("fschauen.util.window") local window = require("fschauen.util.window")
-- window resizing -- window resizing
map("n", "<s-Up>", window.resize_up(2), { desc = "Resize window upward" }) vim.keymap.set("n", "<s-Up>", window.resize_up(2), { desc = "Resize window upward" })
map("n", "<s-Down>", window.resize_down(2), { desc = "Resize window downward" }) vim.keymap.set("n", "<s-Down>", window.resize_down(2), { desc = "Resize window downward" })
map("n", "<s-Left>", window.resize_left(2), { desc = "Resize window leftward" }) vim.keymap.set("n", "<s-Left>", window.resize_left(2), { desc = "Resize window leftward" })
map("n", "<s-Right>", window.resize_right(2), { desc = "Resize window rightward" }) vim.keymap.set("n", "<s-Right>", window.resize_right(2), { desc = "Resize window rightward" })
-- easy tab navigation -- easy tab navigation
map("n", "<Right>", "<cmd>tabnext<cr>") vim.keymap.set("n", "<Right>", "<cmd>tabnext<cr>")
map("n", "<Left>", "<cmd>tabprevious<cr>") vim.keymap.set("n", "<Left>", "<cmd>tabprevious<cr>")
-- move lines up and down -- move lines up and down
map("n", "<c-a-j>", [[:move .+1<cr>==]]) vim.keymap.set("n", "<c-a-j>", [[:move .+1<cr>==]])
map("n", "<c-a-k>", [[:move .-2<cr>==]]) vim.keymap.set("n", "<c-a-k>", [[:move .-2<cr>==]])
map("v", "<c-a-j>", [[:move '>+1<cr>gv=gv]]) vim.keymap.set("v", "<c-a-j>", [[:move '>+1<cr>gv=gv]])
map("v", "<c-a-k>", [[:move '<-2<cr>gv=gv]]) vim.keymap.set("v", "<c-a-k>", [[:move '<-2<cr>gv=gv]])
map("i", "<c-a-j>", [[<esc>:move .+1<cr>==gi]]) vim.keymap.set("i", "<c-a-j>", [[<esc>:move .+1<cr>==gi]])
map("i", "<c-a-k>", [[<esc>:move .-2<cr>==gi]]) vim.keymap.set("i", "<c-a-k>", [[<esc>:move .-2<cr>==gi]])
-- move to begin/end of line in insert mode -- move to begin/end of line in insert mode
map("i", "<c-a>", "<c-o>^") vim.keymap.set("i", "<c-a>", "<c-o>^")
map("i", "<c-e>", "<c-o>$") vim.keymap.set("i", "<c-e>", "<c-o>$")
-- move to begin of line in command mode (<c-e> moves to end by default) -- move to begin of line in command mode (<c-e> moves to end by default)
map("c", "<c-a>", "<c-b>") vim.keymap.set("c", "<c-a>", "<c-b>")
-- more convenient way of entering normal mode from terminal mode -- more convenient way of entering normal mode from terminal mode
map("t", [[<c-\><c-\>]], [[<c-\><c-n>]]) vim.keymap.set("t", [[<c-\><c-\>]], [[<c-\><c-n>]])
-- recall older/recent command-line from history -- recall older/recent command-line from history
map("c", "<c-j>", "<down>") vim.keymap.set("c", "<c-j>", "<down>")
map("c", "<c-k>", "<up>") vim.keymap.set("c", "<c-k>", "<up>")
-- trigger InsertLeave when leaving Insert mode with ctrl-c (see :help i_CTRL-C) -- trigger InsertLeave when leaving Insert mode with ctrl-c (see :help i_CTRL-C)
map("i", "<c-c>", "<esc>") vim.keymap.set("i", "<c-c>", "<esc>")
-- quickly change background -- quickly change background
map("n", "<leader>bg", [[<cmd>let &background = &background ==? "light" ? "dark" : "light"<cr>]]) vim.keymap.set("n", "<leader>bg", [[<cmd>let &background = &background ==? "light" ? "dark" : "light"<cr>]])
-- don't loose the original yanked contents when pasting in visual mode -- don't loose the original yanked contents when pasting in visual mode
map("x", "<leader>p", [["_dP]]) vim.keymap.set("x", "<leader>p", [["_dP]])
local diagnostic = require("fschauen.diagnostic") local diagnostic = require("fschauen.diagnostic")
local ui = require("fschauen.util.icons").ui local ui = require("fschauen.util.icons").ui
-- navigate diagnostics -- navigate diagnostics
map("n", "<leader>dd", diagnostic.toggle, { desc = ui.Diagnostic.." [d]iagnostic enable/[d]isable" }) vim.keymap.set("n", "<leader>dd", diagnostic.toggle, { desc = ui.Diagnostic.." [d]iagnostic enable/[d]isable" })
map("n", "<leader>do", diagnostic.open_float, { desc = ui.Diagnostic.." [d]iagnostic [o]pen" }) vim.keymap.set("n", "<leader>do", diagnostic.open_float, { desc = ui.Diagnostic.." [d]iagnostic [o]pen" })
map("n", "<leader>dh", diagnostic.hide, { desc = ui.Diagnostic.." [d]iagnostic [h]ide" }) vim.keymap.set("n", "<leader>dh", diagnostic.hide, { desc = ui.Diagnostic.." [d]iagnostic [h]ide" })
map("n", "<leader>ds", diagnostic.set_severity, { desc = ui.Diagnostic.." [d]iagnostic [s]everity" }) vim.keymap.set("n", "<leader>ds", diagnostic.set_severity, { desc = ui.Diagnostic.." [d]iagnostic [s]everity" })
-- toggle quickfix and loclist -- toggle quickfix and loclist
map("n", "<leader>q", window.toggle_quickfix, { desc = ui.Toggle.." toggle quickfix" }) vim.keymap.set("n", "<leader>q", window.toggle_quickfix, { desc = ui.Toggle.." toggle quickfix" })
map("n", "<localleader>q", window.toggle_loclist, { desc = ui.Toggle.." toggle loclist" }) vim.keymap.set("n", "<localleader>q", window.toggle_loclist, { desc = ui.Toggle.." toggle loclist" })
local options = require("fschauen.util.options") local options = require("fschauen.util.options")
-- toggle options -- toggle options
map("n", "<leader>sn", options.toggle_number, { desc = ui.Toggle.." toggle 'number'" }) vim.keymap.set("n", "<leader>sn", options.toggle_number, { desc = ui.Toggle.." toggle 'number'" })
map("n", "<leader>sr", options.toggle_relativenumber, { desc = ui.Toggle.." toggle 'relativenumber'" }) vim.keymap.set("n", "<leader>sr", options.toggle_relativenumber, { desc = ui.Toggle.." toggle 'relativenumber'" })
map("n", "<leader>sl", options.toggle_list, { desc = ui.Toggle.." toggle 'list'" }) vim.keymap.set("n", "<leader>sl", options.toggle_list, { desc = ui.Toggle.." toggle 'list'" })
map("n", "<leader>sw", options.toggle_wrap, { desc = ui.Toggle.." toggle 'wrap'" }) vim.keymap.set("n", "<leader>sw", options.toggle_wrap, { desc = ui.Toggle.." toggle 'wrap'" })
map("n", "<leader>ss", options.toggle_spell, { desc = ui.Toggle.." toggle 'spell'" }) vim.keymap.set("n", "<leader>ss", options.toggle_spell, { desc = ui.Toggle.." toggle 'spell'" })
end end
-- stylua: ignore end -- stylua: ignore end