From 11b954ff331b7ad79c93e6fcf756be02b1205070 Mon Sep 17 00:00:00 2001 From: Oliver Hartmann Date: Mon, 5 Dec 2022 15:12:09 +0100 Subject: [PATCH] extract some keys to the plugin configs --- lua/setup/aerial.lua | 12 ++++++-- lua/setup/luasnip.lua | 10 +++++++ lua/setup/my_legendary.lua | 56 -------------------------------------- lua/setup/telescope.lua | 9 ++++++ lua/setup/toggleterm.lua | 13 +++++++-- lua/setup/yanky.lua | 14 ++++++++++ 6 files changed, 54 insertions(+), 60 deletions(-) diff --git a/lua/setup/aerial.lua b/lua/setup/aerial.lua index 882a25c..0978b72 100644 --- a/lua/setup/aerial.lua +++ b/lua/setup/aerial.lua @@ -1,5 +1,5 @@ require('aerial').setup({ - backends = { 'lsp', 'treesitter','markdown' }, + backends = { 'lsp', 'treesitter', 'markdown' }, layout = { default_direction = "prefer_left" }, @@ -7,4 +7,12 @@ require('aerial').setup({ show_guides = true, }) require('telescope').load_extension('aerial') -vim.keymap.set('n', 's', 'AerialToggle', opts) +require('legendary').keymaps( + { + { + 's', + ':AerialToggle', + description = 'Symbols outline', + } + } +) diff --git a/lua/setup/luasnip.lua b/lua/setup/luasnip.lua index a146428..33a5a06 100644 --- a/lua/setup/luasnip.lua +++ b/lua/setup/luasnip.lua @@ -55,3 +55,13 @@ ls.snippets = { require('luasnip.loaders.from_vscode').lazy_load() require('luasnip.loaders.from_vscode').lazy_load({ paths = { "./my-snippets" } }) + + +require('legendary').commands( + { + { + ':LuaSnipListAvailable', + description = 'List snippets', + } + } +) diff --git a/lua/setup/my_legendary.lua b/lua/setup/my_legendary.lua index 221bd8e..8f9a429 100644 --- a/lua/setup/my_legendary.lua +++ b/lua/setup/my_legendary.lua @@ -28,11 +28,6 @@ require('legendary').setup({ ':split .', description = 'Open a new horizontal split', }, - { - 'g', - ':lua _lazygit_toggle()', - description = 'Open lazygit', - }, { 'a', '"ayiw', @@ -43,36 +38,9 @@ require('legendary').setup({ 'za', description = 'Toggle fold', }, - { - '', - '(YankyCycleForward)', - description = 'Yanky cycle forward', - }, - { - '', - '(YankyCycleBackward)', - description = 'Yanky cycle backward', - }, - { - 's', - ':AerialToggle', - description = 'Symbols outline', - }, }, commands = { - { - ':Octo pr list', - description = 'Github list PRs', - }, - { - ':Octo pr checkout', - description = 'Github checkout PR', - }, - { - ':Octo pr browser', - description = 'Github open PR in browser', - }, { ':set guifont=JetBrainsMonoNL\\ NF:h12', description = 'Big font size', @@ -81,30 +49,6 @@ require('legendary').setup({ ':set guifont=JetBrainsMonoNL\\ NF:h9', description = 'Reset font size', }, - { - ':CMake build_all', - description = 'CMake build all', - }, - { - ':CMake configure', - description = 'CMake configure', - }, - { - ':CMake select_target', - description = 'CMake select target', - }, - { - ':CMake clear_cache', - description = 'CMake clear cache', - }, - { - ':LuaSnipListAvailable', - description = 'List snippets', - }, - { - ":lua require('telescope.builtin').live_grep({ prompt_title = 'find string in open buffers...', grep_open_files = true })", - description = 'Search in open files', - }, } }) diff --git a/lua/setup/telescope.lua b/lua/setup/telescope.lua index ce7abbc..367d1c2 100644 --- a/lua/setup/telescope.lua +++ b/lua/setup/telescope.lua @@ -124,3 +124,12 @@ require('legendary').keymaps( } } ) + +require('legendary').func( + { + function() + require('telescope.builtin').live_grep({ prompt_title = 'find string in open buffers...', grep_open_files = true }) + end, + description = 'Search in open files', + } +) diff --git a/lua/setup/toggleterm.lua b/lua/setup/toggleterm.lua index 11aab75..09efcd4 100644 --- a/lua/setup/toggleterm.lua +++ b/lua/setup/toggleterm.lua @@ -1,4 +1,3 @@ - function _G.set_terminal_keymaps(term) local opts = { noremap = true } if (term.cmd ~= 'lazygit') then @@ -23,7 +22,7 @@ local lazygit = Terminal:new({ hidden = true, direction = 'float', on_open = function(term) - vim.api.nvim_buf_set_keymap(term.bufnr, "n", "q", "close", {noremap = true, silent = true}) + vim.api.nvim_buf_set_keymap(term.bufnr, "n", "q", "close", { noremap = true, silent = true }) -- vim.api.nvim_buf_set_keymap(term.bufnr, 't', '', '', {noremap = true, silent = true}) end, }) @@ -31,3 +30,13 @@ local lazygit = Terminal:new({ function _lazygit_toggle() lazygit:toggle() end + +require('legendary').keymaps( + { + { + 'g', + ':lua _lazygit_toggle()', + description = 'Open lazygit', + } + } +) diff --git a/lua/setup/yanky.lua b/lua/setup/yanky.lua index 74a3d34..bfcf475 100644 --- a/lua/setup/yanky.lua +++ b/lua/setup/yanky.lua @@ -11,3 +11,17 @@ vim.keymap.set("n", "", "(YankyCycleForward)", {}) vim.keymap.set("n", "", "(YankyCycleBackward)", {}) require("telescope").load_extension('yank_history') +require('legendary').keymaps( + { + { + '', + '(YankyCycleForward)', + description = 'Yanky cycle forward', + }, + { + '', + '(YankyCycleBackward)', + description = 'Yanky cycle backward', + }, + } +)