From 906487f9396ea7b238785ce462293c1643855d93 Mon Sep 17 00:00:00 2001 From: Ismo Vuorinen Date: Thu, 31 Aug 2023 10:26:52 +0300 Subject: [PATCH] chore(nvim): keymappings --- config/nvim/lua/keymappings.lua | 110 ++++++++------------- config/nvim/lua/plugins/telescope-nvim.lua | 9 ++ 2 files changed, 49 insertions(+), 70 deletions(-) diff --git a/config/nvim/lua/keymappings.lua b/config/nvim/lua/keymappings.lua index 5f35700..4c2cd18 100644 --- a/config/nvim/lua/keymappings.lua +++ b/config/nvim/lua/keymappings.lua @@ -45,6 +45,18 @@ wk.register({ "Delete hidden buffers", }, }, + g = { + name = "Goto buffer", + ["1"] = { "buffer! 1", "Buffer 1" }, + ["2"] = { "buffer! 2", "Buffer 2" }, + ["3"] = { "buffer! 3", "Buffer 3" }, + ["4"] = { "buffer! 4", "Buffer 4" }, + ["5"] = { "buffer! 5", "Buffer 5" }, + ["6"] = { "buffer! 6", "Buffer 6" }, + ["7"] = { "buffer! 7", "Buffer 7" }, + ["8"] = { "buffer! 8", "Buffer 8" }, + ["9"] = { "buffer! 9", "Buffer 9" }, + }, }, D = { name = "[D]iagnostics (Trouble)", @@ -54,6 +66,12 @@ wk.register({ n = { ":lua vim.diagnostic.goto_next()", "[D]iagnostics: [n]ext" }, p = { ":lua vim.diagnostic.goto_prev()", "[D]iagnostics: [p]rev" }, }, + e = { + function() + vim.cmd("Neotree focus source=filesystem position=left") + end, + "Toggle the sidebar tree of the root folder.", + }, f = { name = "[f]ind", -- Find recursively files across the root folder subfiles. @@ -108,29 +126,42 @@ wk.register({ x = { ":Bdelete", "[x]: Close current buffer" }, }, { prefix = "" }) --- Normal mode, prefix +-- ╭──────────────────────────────────────────────────────────╮ +-- │ Normal mode, prefix │ +-- ╰──────────────────────────────────────────────────────────╯ wk.register({ b = { name = "Buffer" }, }, { mode = "n", prefix = "" }) --- Insert mode, prefix +-- ╭──────────────────────────────────────────────────────────╮ +-- │ Insert mode, prefix │ +-- ╰──────────────────────────────────────────────────────────╯ wk.register({ b = { name = "Buffer" }, }, { mode = "i", prefix = "" }) +-- ╭──────────────────────────────────────────────────────────╮ +-- │ Insert mode, no prefix │ +-- ╰──────────────────────────────────────────────────────────╯ +wk.register({ + [""] = { "w", "Save file" }, + [""] = { "", "Do just Home on CTRL + Home" }, +}, { mode = "i", prefix = "" }) + +-- ╭──────────────────────────────────────────────────────────╮ +-- │ All modes, no prefix │ +-- ╰──────────────────────────────────────────────────────────╯ +wk.register({ + [""] = { "w", "Save file" }, + [""] = { "", "Do just End on CTRL + End" }, +}, { prefix = "" }) + -- Go to the next block. --key('n', '', 'g%', remap ) -- Loop through brackets blocks. --key('n', '', 'z%', remap ) --- Do just End on CTRL + End. -key("i", "", "", remap) -key("n", "", "", remap) - --- Do just Home on CTRL + Home. -key("i", "", "", remap) - -- Highlight the word after pressing enter. key( "n", @@ -150,14 +181,6 @@ key( -- Toggle highlight of search key("n", "", ":set hlsearch!", remap) --- Toggle the sidebar tree of the root folder. -key("n", "e", "", { - noremap = true, - silent = true, - desc = "Open NeoTree without warnings", - callback = function() vim.cmd("Neotree toggle source=filesystem position=left") end, -}) - -- Try to correct the current word. key("i", "", "ea", remap) @@ -181,9 +204,6 @@ key("v", "", "mad`ai", { silent = true }) key("v", "", "may`ai", remap) key("i", "", ":Registers", remap) --- Set 'CTRL + s as save' -key("n", "", "w", remap) - -- Create mark. key("n", "'", "`", remap) @@ -227,53 +247,3 @@ key("v", ">", ">gv", remap) -- Set 'Backspace' as 'delete selection' for the visual selection. key("v", "", '"_di', remap) - ---- - --- Barbar keymappings - -local map = vim.api.nvim_set_keymap -local opts = { noremap = true, silent = true } - --- Move to previous/next -map("n", "", "BufferPrevious", opts) -map("n", "", "BufferNext", opts) --- Re-order to previous/next -map("n", "", "BufferMovePrevious", opts) -map("n", ">", "BufferMoveNext", opts) --- Goto buffer in position... -map("n", "", "BufferGoto 1", opts) -map("n", "", "BufferGoto 2", opts) -map("n", "", "BufferGoto 3", opts) -map("n", "", "BufferGoto 4", opts) -map("n", "", "BufferGoto 5", opts) -map("n", "", "BufferGoto 6", opts) -map("n", "", "BufferGoto 7", opts) -map("n", "", "BufferGoto 8", opts) -map("n", "", "BufferGoto 9", opts) -map("n", "", "BufferLast", opts) --- Pin/unpin buffer -map("n", "", "BufferPin", opts) - --- Close buffer --- map('n', '', 'BufferClose', opts) - --- Wipeout buffer --- :BufferWipeout --- Close commands --- :BufferCloseAllButCurrent --- :BufferCloseAllButPinned --- :BufferCloseAllButCurrentOrPinned --- :BufferCloseBuffersLeft --- :BufferCloseBuffersRight --- Magic buffer-picking mode -map("n", "", "BufferPick", opts) --- Sort automatically by... -map("n", "bb", "BufferOrderByBufferNumber", opts) -map("n", "bd", "BufferOrderByDirectory", opts) -map("n", "bl", "BufferOrderByLanguage", opts) -map("n", "bw", "BufferOrderByWindowNumber", opts) - --- Other: --- :BarbarEnable - enables barbar (enabled by default) --- :BarbarDisable - very bad command, should never be used diff --git a/config/nvim/lua/plugins/telescope-nvim.lua b/config/nvim/lua/plugins/telescope-nvim.lua index 884b6c5..64c097c 100644 --- a/config/nvim/lua/plugins/telescope-nvim.lua +++ b/config/nvim/lua/plugins/telescope-nvim.lua @@ -77,6 +77,15 @@ return { -- Developer configurations: Not meant for general override buffer_previewer_maker = previewers.buffer_previewer_maker, }, + pickers = { + buffers = { + mappings = { + i = { + [""] = actions.delete_buffer + actions.move_to_top, + } + } + } + }, extensions_list = { "themes", "terms" }, })