vim: use API for setting keymaps
This commit is contained in:
parent
cc343b91c4
commit
b31dcac34e
1 changed files with 62 additions and 65 deletions
|
|
@ -1,79 +1,76 @@
|
||||||
|
local M = function(mode, lhs, rhs, opts)
|
||||||
|
local merged_opts = vim.tbl_extend('keep', opts or {}, { noremap = true })
|
||||||
|
local map = { mode = mode, lhs = lhs, rhs = rhs, opts = merged_opts }
|
||||||
|
map.remap = function() map.opts.noremap = false; return map end
|
||||||
|
map.silent = function() map.opts.silent = true; return map end
|
||||||
|
map.expr = function() map.opts.expr = true; return map end
|
||||||
|
map.unique = function() map.opts.unique = true; return map end
|
||||||
|
map.nowait = function() map.opts.nowait = true; return map end
|
||||||
|
map.script = function() map.opts.script = true; return map end
|
||||||
|
return map
|
||||||
|
end
|
||||||
|
|
||||||
|
local register = function(maps)
|
||||||
|
for _, m in ipairs(maps) do
|
||||||
|
vim.api.nvim_set_keymap(m.mode, m.lhs, m.rhs, m.opts)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
vim.g.mapleader = ' '
|
vim.g.mapleader = ' '
|
||||||
|
|
||||||
|
register {
|
||||||
-- better navigation for wrapped lines
|
-- better navigation for wrapped lines
|
||||||
vim.cmd([[noremap j gj]])
|
M('n', 'j', 'gj'),
|
||||||
vim.cmd([[noremap k gk]])
|
M('n', 'k', 'gk'),
|
||||||
|
|
||||||
-- retain selection when indenting/unindenting in visual mode
|
-- retain selection when indenting/unindenting in visual mode
|
||||||
vim.cmd([[vnoremap > ><cr>gv]])
|
M('v', '>', '><cr>gv'),
|
||||||
vim.cmd([[vnoremap < <<cr>gv]])
|
M('v', '<', '<<cr>gv'),
|
||||||
|
|
||||||
-- easier window navigation
|
-- easier window navigation
|
||||||
vim.cmd([[nnoremap <c-j> <c-w>j]])
|
M('n', '<c-j>', '<c-w>j'),
|
||||||
vim.cmd([[nnoremap <c-k> <c-w>k]])
|
M('n', '<c-k>', '<c-w>k'),
|
||||||
vim.cmd([[nnoremap <c-h> <c-w>h]])
|
M('n', '<c-h>', '<c-w>h'),
|
||||||
vim.cmd([[nnoremap <c-l> <c-w>l]])
|
M('n', '<c-l>', '<c-w>l'),
|
||||||
|
|
||||||
-- window resizing
|
-- window resizing
|
||||||
vim.cmd([[nnoremap <Up> <cmd>resize +1<cr>]])
|
M('n', '<Up>', '<cmd>resize +1<cr>'),
|
||||||
vim.cmd([[nnoremap <Down> <cmd>resize -1<cr>]])
|
M('n', '<Down>', '<cmd>resize -1<cr>'),
|
||||||
vim.cmd([[nnoremap <Left> <cmd>vertical resize -1<cr>]])
|
M('n', '<Left>', '<cmd>vertical resize -1<cr>'),
|
||||||
vim.cmd([[nnoremap <Right> <cmd>vertical resize +1<cr>]])
|
M('n', '<Right>', '<cmd>vertical resize +1<cr>'),
|
||||||
|
|
||||||
-- easier tab navigation
|
-- easier tab navigation
|
||||||
vim.cmd([[nnoremap <silent> <c-n> :tabprevious<cr>]])
|
M('n', '<c-n>', ':tabprevious<cr>').silent(),
|
||||||
vim.cmd([[nnoremap <silent> <c-m> :tabnext<cr>]])
|
M('n', '<c-m>', ':tabnext<cr>' ).silent(),
|
||||||
|
|
||||||
-- move lines up and down
|
-- move lines up and down
|
||||||
vim.cmd([[nnoremap <silent> <A-j> :move .+1<cr>==]])
|
M('n', '<A-j>', [[:move .+1<cr>==]] ).silent(),
|
||||||
vim.cmd([[nnoremap <silent> <A-k> :move .-2<cr>==]])
|
M('n', '<A-k>', [[:move .-2<cr>==]] ).silent(),
|
||||||
vim.cmd([[vnoremap <silent> <A-j> :move '>+1<cr>gv=gv]])
|
M('v', '<A-j>', [[:move '>+1<cr>gv=gv]] ).silent(),
|
||||||
vim.cmd([[vnoremap <silent> <A-k> :move '<-2<cr>gv=gv]])
|
M('v', '<A-k>', [[:move '<-2<cr>gv=gv]] ).silent(),
|
||||||
vim.cmd([[inoremap <silent> <A-j> <esc>:move .+1<cr>==gi]])
|
M('i', '<A-j>', [[<esc>:move .+1<cr>==gi]] ).silent(),
|
||||||
vim.cmd([[inoremap <silent> <A-k> <esc>:move .-2<cr>==gi]])
|
M('i', '<A-k>', [[<esc>:move .-2<cr>==gi]] ).silent(),
|
||||||
|
|
||||||
-- cycle through line numbering modes
|
-- cycle through line numbering modes
|
||||||
vim.cmd([[nnoremap <silent> <leader>ln :set nonumber norelativenumber<CR>]])
|
M('n', '<leader>ln', ':set nonumber norelativenumber<CR>' ).silent(),
|
||||||
vim.cmd([[nnoremap <silent> <leader>ll :set number norelativenumber<CR>]])
|
M('n', '<leader>ll', ':set number norelativenumber<CR>' ).silent(),
|
||||||
vim.cmd([[nnoremap <silent> <leader>lr :set number relativenumber<CR>]])
|
M('n', '<leader>lr', ':set number relativenumber<CR>' ).silent(),
|
||||||
|
|
||||||
-- show list of buffers and prepare to switch
|
-- show list of buffers and prepare to switch
|
||||||
vim.cmd([[nnoremap <leader>bf :ls<CR>:b<Space>]])
|
M('n', '<leader>bf', ':ls<CR>:b<Space>'),
|
||||||
|
|
||||||
-- quickly change background
|
-- quickly change background
|
||||||
vim.cmd([[nnoremap <leader>bg :let &background = &background ==? 'light' ? 'dark' : 'light'<cr>]])
|
M('n', '<leader>bg', [[:let &background = &background ==? 'light' ? 'dark' : 'light'<cr>]]),
|
||||||
|
|
||||||
-- toggle search highlight
|
-- toggle search highlight
|
||||||
vim.cmd([[nnoremap <leader>h :set hlsearch!<cr>]])
|
M('n', '<leader>h', ':set hlsearch!<cr>'),
|
||||||
|
|
||||||
-- toggle NERDTree
|
-- toggle NERDTree
|
||||||
vim.cmd([[nnoremap <leader>n :NERDTreeToggle<cr>]])
|
M('n', '<leader>n', ':NERDTreeToggle<cr>'),
|
||||||
|
|
||||||
-- toggle rainbow parens
|
-- toggle rainbow parens
|
||||||
vim.cmd([[nnoremap <leader>p :RainbowParentheses!!<cr>]])
|
M('n', '<leader>p', ':RainbowParentheses!!<cr>'),
|
||||||
|
|
||||||
-- fix whitespace
|
-- fix whitespace
|
||||||
vim.cmd([[nnoremap <leader>w :FixWhitespace<cr>]])
|
M('n', '<leader>w', ':FixWhitespace<cr>'),
|
||||||
|
}
|
||||||
|
|
||||||
-- " Double leader key for toggling visual-line mode
|
|
||||||
-- nmap <Leader><Leader> V
|
|
||||||
-- xmap <Leader><Leader> <Esc>
|
|
||||||
|
|
||||||
-- " Toggle fold
|
|
||||||
-- nnoremap <CR> za
|
|
||||||
|
|
||||||
-- nnoremap Q q
|
|
||||||
-- nnoremap gQ @q
|
|
||||||
|
|
||||||
-- " Start new line from any cursor position in insert-mode
|
|
||||||
-- inoremap <S-Return> <C-o>o
|
|
||||||
|
|
||||||
-- " Change current word in a repeatable manner
|
|
||||||
-- nnoremap <Leader>cn *``cgn
|
|
||||||
-- nnoremap <Leader>cN *``cgN
|
|
||||||
|
|
||||||
-- " Change the current word in insertmode.
|
|
||||||
-- " Auto places you into the spot where you can start typing to change it.
|
|
||||||
-- nnoremap <c-w><c-r> :%s/<c-r><c-w>//g<left><left>
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue