From c643e6fc2898561b45c0e0ea70aabaeb38fc1c08 Mon Sep 17 00:00:00 2001 From: TheK4n Date: Sun, 15 Jan 2023 20:24:02 +0300 Subject: [PATCH] add(nvim) silent all maps, map ,rr to run scripts --- sub/nvim/lua/base/maps.lua | 46 +++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/sub/nvim/lua/base/maps.lua b/sub/nvim/lua/base/maps.lua index c0c3feb..2aa314a 100644 --- a/sub/nvim/lua/base/maps.lua +++ b/sub/nvim/lua/base/maps.lua @@ -31,48 +31,48 @@ keymap.set('n', 'c', [[:call TabDo('set cursorline!')]], {silent = t keymap.set('n', '/', [[:set invhlsearch]], {silent = true}) -keymap.set('i', 'jk', '') -keymap.set('i', 'ол', '') +keymap.set('i', 'jk', '', {silent = true}) +keymap.set('i', 'ол', '', {silent = true}) -- x to blackhole -keymap.set('n', 'x', '"_x') +keymap.set('n', 'x', '"_x', {silent = true}) -- Increment/decrement -keymap.set('n', '+', '') -keymap.set('n', '-', '') +keymap.set('n', '+', '', {silent = true}) +keymap.set('n', '-', '', {silent = true}) -- Select all -keymap.set('n', '', 'ggG') +keymap.set('n', '', 'ggG', {silent = true}) -- Scroll tabs -keymap.set("n", '', ':tabnext') -keymap.set("n", '', ':tabprev') +keymap.set("n", '', ':tabnext', {silent = true}) +keymap.set("n", '', ':tabprev', {silent = true}) -- Kill current buffer -keymap.set("n", 'qq', ':bd!') +keymap.set("n", 'qq', ':bd!', {silent = true}) -- Quick exit without saving -keymap.set("n", 'qa', ':qa!') +keymap.set("n", 'qa', ':qa!', {silent = true}) -keymap.set("n", 'eh', ':set list!') +keymap.set("n", 'eh', ':set list!', {silent = true}) vim.opt.listchars=[[tab:→\ ,eol:↵,trail:·,extends:↷,precedes:↶]] --- Tags panes (ctags required) -keymap.set("n", 't', ':TagbarToggle') +-- Tags panel (ctags required) +keymap.set("n", 't', ':TagbarToggle', {silent = true}) -- Telescope -keymap.set("n", 'ff', 'Telescope find_files') -keymap.set("n", 'fg', 'Telescope live_grep') +keymap.set("n", 'ff', 'Telescope find_files', {silent = true}) +keymap.set("n", 'fg', 'Telescope live_grep', {silent = true}) -- Expand %% to dirname of current file in command line -keymap.set("c", '%%', [[getcmdtype() == ':' ? expand('%:h').'/' : '%%']], {expr = true}) +keymap.set("c", '%%', [[getcmdtype() == ':' ? expand('%:h').'/' : '%%']], {expr = true, silent = true}) -- Save from root @@ -88,14 +88,18 @@ function create_autocmd_filetype(func) ) end -function set_keymap_run_script() - if vim.bo.filetype == 'python' then - cmd_string = string.format([[:tabnew %% :terminal %s %% :set nocursorline number norelativenumber G ]], 'python3') - keymap.set("n", "rr", cmd_string) +function create_func(ft, cmd) + return function() + if vim.bo.filetype == ft then + cmd_string = string.format([[:tabnew %% :terminal %s %% :set nocursorline number norelativenumber G ]], cmd) + keymap.set("n", "rr", cmd_string) + end end end -create_autocmd_filetype(set_keymap_run_script) +create_autocmd_filetype(create_func('python', 'python3')) +create_autocmd_filetype(create_func('go', 'go run')) +create_autocmd_filetype(create_func('rust', 'cargo run'))