commit db6f1d569e4e938aedc2579ac02d13195fbb2adc
parent 41e89bd1401292e7970f2715b2af90302543d8da
Author: Tomas Nemec <nemi@skaut.cz>
Date: Mon, 10 Jan 2022 12:03:24 +0100
update keybinds
Diffstat:
3 files changed, 88 insertions(+), 79 deletions(-)
diff --git a/init.lua b/init.lua
@@ -7,10 +7,6 @@ local impatient_path = install_path .. '/start/impatient.nvim'
if vim.fn.empty(vim.fn.glob(impatient_path)) > 0 then
vim.api.nvim_command('!git clone --depth=1 https://github.com/lewis6991/impatient.nvim ' .. impatient_path)
end
-local astronauta_path = install_path .. '/start/astronauta.nvim'
-if vim.fn.empty(vim.fn.glob(astronauta_path)) > 0 then
- vim.api.nvim_command('!git clone --depth=1 https://github.com/tjdevries/astronauta.nvim ' .. astronauta_path)
-end
local colorbuddy_path = install_path .. '/start/colorbuddy.nvim'
if vim.fn.empty(vim.fn.glob(colorbuddy_path)) > 0 then
vim.api.nvim_command('!git clone --depth=1 https://github.com/tjdevries/colorbuddy.nvim ' .. colorbuddy_path)
@@ -23,7 +19,7 @@ end
-- Meta setup
require('impatient') -- faster `require`
-require('astronauta.keymap') -- vim.keymap
+require('tms.c.keybind') -- vim.keymap
require('colorbuddy').colorscheme('my-default')
-- disable netrw
@@ -80,91 +76,86 @@ vim.opt.signcolumn = 'yes:1'
-- MAPPINGS
vim.g.mapleader = ','
-local nmap = vim.keymap.nmap
-local nnoremap = vim.keymap.nnoremap
-local tnoremap = vim.keymap.tnoremap
-local vnoremap = vim.keymap.vnoremap
-local inoremap = vim.keymap.inoremap
-- forget visual
-nmap {'Q', '<nop>'}
+vim.keymap.nmap {'Q', '<nop>'}
-- kb.nnoremap('<tab>', 'za')
-nmap {'<esc>', '<cmd>nohl<cr>', silent = true}
-nnoremap {'gA', 'ga'}
-nnoremap {'Y', 'y$'}
-nnoremap {'n', 'nzzzv'}
-nnoremap {'N', 'Nzzzv'}
-nnoremap {'J', 'mzJ`z'}
-inoremap {',', ',<c-g>u'}
-inoremap {'.', '.<c-g>u'}
-inoremap {'!', '!<c-g>u'}
-inoremap {'?', '?<c-g>u'}
+vim.keymap.nmap {'<esc>', '<cmd>nohl<cr>', silent = true}
+vim.keymap.nnoremap {'gA', 'ga'}
+vim.keymap.nnoremap {'Y', 'y$'}
+vim.keymap.nnoremap {'n', 'nzzzv'}
+vim.keymap.nnoremap {'N', 'Nzzzv'}
+vim.keymap.nnoremap {'J', 'mzJ`z'}
+vim.keymap.inoremap {',', ',<c-g>u'}
+vim.keymap.inoremap {'.', '.<c-g>u'}
+vim.keymap.inoremap {'!', '!<c-g>u'}
+vim.keymap.inoremap {'?', '?<c-g>u'}
-- shortcuts
-nnoremap {'<leader>w', '<cmd>write<cr>'}
-nnoremap {'<leader>W', '<cmd>wall<cr>'}
-nnoremap {'<leader>e', '<cmd>edit<cr>'}
-nnoremap {'<leader>E', ':e %:h/'}
-nnoremap {'<leader>q', '<cmd>quit<cr>'}
-nnoremap {'<leader>Q', '<cmd>quit!<cr>'}
-nnoremap {'<leader>M', '<cmd>messages<cr>'}
-nnoremap {'<leader>so', '<cmd>source<cr>'}
-nnoremap {'<leader>bo', '<cmd>BufOnly<cr>'}
-nnoremap {'<leader>bO', '<cmd>BufOnly!<cr>'}
+vim.keymap.nnoremap {'<leader>w', '<cmd>write<cr>'}
+vim.keymap.nnoremap {'<leader>W', '<cmd>wall<cr>'}
+vim.keymap.nnoremap {'<leader>e', '<cmd>edit<cr>'}
+vim.keymap.nnoremap {'<leader>E', ':e %:h/'}
+vim.keymap.nnoremap {'<leader>q', '<cmd>quit<cr>'}
+vim.keymap.nnoremap {'<leader>Q', '<cmd>quit!<cr>'}
+vim.keymap.nnoremap {'<leader>M', '<cmd>messages<cr>'}
+vim.keymap.nnoremap {'<leader>so', '<cmd>source<cr>'}
+vim.keymap.nnoremap {'<leader>bo', '<cmd>BufOnly<cr>'}
+vim.keymap.nnoremap {'<leader>bO', '<cmd>BufOnly!<cr>'}
-- window movement
-nnoremap {'<a-h>', '<c-w>h'}
-nnoremap {'<a-j>', '<c-w>j'}
-nnoremap {'<a-k>', '<c-w>k'}
-nnoremap {'<a-l>', '<c-w>l'}
+vim.keymap.nnoremap {'<a-h>', '<c-w>h'}
+vim.keymap.nnoremap {'<a-j>', '<c-w>j'}
+vim.keymap.nnoremap {'<a-k>', '<c-w>k'}
+vim.keymap.nnoremap {'<a-l>', '<c-w>l'}
-- window movement in terminal
-tnoremap {'<a-l>', '<c-\\><c-n><c-w>l'}
-tnoremap {'<a-j>', '<c-\\><c-n><c-w>j'}
-tnoremap {'<a-k>', '<c-\\><c-n><c-w>k'}
-tnoremap {'<a-h>', '<c-\\><c-n><c-w>h'}
-tnoremap {'<a-r>', '<c-\\><c-n>'}
+vim.keymap.tnoremap {'<a-l>', '<c-\\><c-n><c-w>l'}
+vim.keymap.tnoremap {'<a-j>', '<c-\\><c-n><c-w>j'}
+vim.keymap.tnoremap {'<a-k>', '<c-\\><c-n><c-w>k'}
+vim.keymap.tnoremap {'<a-h>', '<c-\\><c-n><c-w>h'}
+vim.keymap.tnoremap {'<a-r>', '<c-\\><c-n>'}
-- window move
-nnoremap {'<a-H>', '<c-w>H'}
-nnoremap {'<a-J>', '<c-w>J'}
-nnoremap {'<a-K>', '<c-w>K'}
-nnoremap {'<a-L>', '<c-w>L'}
+vim.keymap.nnoremap {'<a-H>', '<c-w>H'}
+vim.keymap.nnoremap {'<a-J>', '<c-w>J'}
+vim.keymap.nnoremap {'<a-K>', '<c-w>K'}
+vim.keymap.nnoremap {'<a-L>', '<c-w>L'}
-- window split
-nnoremap {'<c-w><c-s>', require('tms.p.vifm').split, silent = true}
-nnoremap {'<c-w><c-v>', require('tms.p.vifm').vsplit, silent = true}
-nnoremap {'<c-w><c-w>', require('tms.p.vifm').current, silent = true}
-nnoremap {'<c-w>V', '<cmd>vnew<cr>'}
-nnoremap {'<c-w>S', '<cmd>new<cr>'}
+vim.keymap.nnoremap {'<c-w><c-s>', require('tms.p.vifm').split, silent = true}
+vim.keymap.nnoremap {'<c-w><c-v>', require('tms.p.vifm').vsplit, silent = true}
+vim.keymap.nnoremap {'<c-w><c-w>', require('tms.p.vifm').current, silent = true}
+vim.keymap.nnoremap {'<c-w>V', '<cmd>vnew<cr>'}
+vim.keymap.nnoremap {'<c-w>S', '<cmd>new<cr>'}
-- line movement
-nnoremap {'<c-j>', ':m .+1<cr>=='}
-nnoremap {'<c-k>', ':m .-2<cr>=='}
-inoremap {'<c-j>', '<esc>:m .+1<cr>=='}
-inoremap {'<c-k>', '<esc>:m .-2<cr>=='}
-vnoremap {'<c-j>', ':m \'>+1<cr>gv=gv'}
-vnoremap {'<c-k>', ':m \'<-2<cr>gv=gv'}
+vim.keymap.nnoremap {'<c-j>', ':m .+1<cr>=='}
+vim.keymap.nnoremap {'<c-k>', ':m .-2<cr>=='}
+vim.keymap.inoremap {'<c-j>', '<esc>:m .+1<cr>=='}
+vim.keymap.inoremap {'<c-k>', '<esc>:m .-2<cr>=='}
+vim.keymap.vnoremap {'<c-j>', ':m \'>+1<cr>gv=gv'}
+vim.keymap.vnoremap {'<c-k>', ':m \'<-2<cr>gv=gv'}
-- quickfix/loclist
-nnoremap {'<leader>c', '<cmd>call ToggleList("Quickfix List", "c")<cr>'}
-nnoremap {'<leader>C', '<cmd>cexpr []|cclose<cr>'}
-nnoremap {'<leader>l', '<cmd>call ToggleList("Location List", "l")<cr>'}
-nnoremap {'<leader>L', '<cmd>lexpr []|lclose<cr>'}
+vim.keymap.nnoremap {'<leader>c', '<cmd>call ToggleList("Quickfix List", "c")<cr>'}
+vim.keymap.nnoremap {'<leader>C', '<cmd>cexpr []|cclose<cr>'}
+vim.keymap.nnoremap {'<leader>l', '<cmd>call ToggleList("Location List", "l")<cr>'}
+vim.keymap.nnoremap {'<leader>L', '<cmd>lexpr []|lclose<cr>'}
-- fold
-nnoremap {'zH', 'zM'}
-nnoremap {'zh', 'zm'}
-nnoremap {'zj', 'zo'}
-nnoremap {'zJ', 'zO'}
-nnoremap {'zk', 'zc'}
-nnoremap {'zK', 'zC'}
-nnoremap {'zl', 'zr'}
-nnoremap {'zL', 'zR'}
+vim.keymap.nnoremap {'zH', 'zM'}
+vim.keymap.nnoremap {'zh', 'zm'}
+vim.keymap.nnoremap {'zj', 'zo'}
+vim.keymap.nnoremap {'zJ', 'zO'}
+vim.keymap.nnoremap {'zk', 'zc'}
+vim.keymap.nnoremap {'zK', 'zC'}
+vim.keymap.nnoremap {'zl', 'zr'}
+vim.keymap.nnoremap {'zL', 'zR'}
-- copy / paste
-vnoremap {'<c-c>', '\"*y'}
-inoremap {'<c-v>', '<esc>lmv\"*P`v'}
-nnoremap {'gp', '`[v`]'} -- reselect pasted text
+vim.keymap.vnoremap {'<c-c>', '\"*y'}
+vim.keymap.inoremap {'<c-v>', '<esc>lmv\"*P`v'}
+vim.keymap.nnoremap {'gp', '`[v`]'} -- reselect pasted text
-- remap double usage
-nnoremap {'y.', 'yy'}
-nnoremap {'z.', 'mmz.`m'}
-nnoremap {'d.', 'dd'}
-nnoremap {'c.', 'cc'}
-nnoremap {'g.', 'gg'}
-nnoremap {'v.', 'V'}
-nnoremap {'=.', '=='}
-nnoremap {'gc.', 'gcc'}
+vim.keymap.nnoremap {'y.', 'yy'}
+vim.keymap.nnoremap {'z.', 'mmz.`m'}
+vim.keymap.nnoremap {'d.', 'dd'}
+vim.keymap.nnoremap {'c.', 'cc'}
+vim.keymap.nnoremap {'g.', 'gg'}
+vim.keymap.nnoremap {'v.', 'V'}
+vim.keymap.nnoremap {'=.', '=='}
+vim.keymap.nnoremap {'gc.', 'gcc'}
-- autocommands
local au = require('tms.c.autocmd')
diff --git a/lua/tms/c/keybind.lua b/lua/tms/c/keybind.lua
@@ -0,0 +1,19 @@
+local nmap = function(tbl) vim.keymap.set('n', tbl[1], tbl[2]) end
+local omap = function(tbl) vim.keymap.set('o', tbl[1], tbl[2]) end
+local xmap = function(tbl) vim.keymap.set('x', tbl[1], tbl[2]) end
+local nnoremap = function(tbl) vim.keymap.set('n', tbl[1], tbl[2], {noremap = true}) end
+local snoremap = function(tbl) vim.keymap.set('s', tbl[1], tbl[2], {noremap = true}) end
+local xnoremap = function(tbl) vim.keymap.set('x', tbl[1], tbl[2], {noremap = true}) end
+local tnoremap = function(tbl) vim.keymap.set('t', tbl[1], tbl[2], {noremap = true}) end
+local vnoremap = function(tbl) vim.keymap.set('v', tbl[1], tbl[2], {noremap = true}) end
+local inoremap = function(tbl) vim.keymap.set('i', tbl[1], tbl[2], {noremap = true}) end
+
+vim.keymap.nmap = nmap
+vim.keymap.omap = omap
+vim.keymap.xmap = xmap
+vim.keymap.nnoremap = nnoremap
+vim.keymap.xnoremap = xnoremap
+vim.keymap.snoremap = snoremap
+vim.keymap.tnoremap = tnoremap
+vim.keymap.vnoremap = vnoremap
+vim.keymap.inoremap = inoremap
diff --git a/lua/tms/plugins.lua b/lua/tms/plugins.lua
@@ -9,7 +9,6 @@ return packer.startup({
use {'tweekmonster/startuptime.vim'}
use {'nathom/filetype.nvim'}
use {'lewis6991/impatient.nvim'}
- use {'tjdevries/astronauta.nvim'}
-- colorscheme
use {'tjdevries/colorbuddy.nvim'}
