move which-key to mappings
This commit is contained in:
fiplox
parent
4ba43c72a9
commit
23e67e9580
@ -86,10 +86,136 @@ function UnMapDHM()
|
|||||||
vim.api.nvim_del_keymap('n', 'N')
|
vim.api.nvim_del_keymap('n', 'N')
|
||||||
end
|
end
|
||||||
|
|
||||||
local handle = io.popen 'lsusb | grep -c Sofle'
|
-- local handle = io.popen 'lsusb | grep -c Sofle'
|
||||||
local automap = handle:read '*n'
|
-- local automap = handle:read '*n'
|
||||||
handle:close()
|
-- handle:close()
|
||||||
|
|
||||||
if automap or os.getenv("SSH_TTY") then
|
-- if automap or os.getenv("SSH_TTY") then
|
||||||
MapDHM()
|
MapDHM()
|
||||||
end
|
-- end
|
||||||
|
|
||||||
|
local wk = require 'which-key'
|
||||||
|
|
||||||
|
-- which-key {{{
|
||||||
|
wk.setup {
|
||||||
|
plugins = {
|
||||||
|
marks = true, -- shows a list of your marks on ' and `
|
||||||
|
registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode
|
||||||
|
-- the presets plugin, adds help for a bunch of default keybindings in Neovim
|
||||||
|
-- No actual key bindings are created
|
||||||
|
presets = {
|
||||||
|
operators = true, -- adds help for operators like d, y, ...
|
||||||
|
motions = true, -- adds help for motions
|
||||||
|
text_objects = false, -- help for text objects triggered after entering an operator
|
||||||
|
windows = true, -- default bindings on <c-w>
|
||||||
|
nav = true, -- misc bindings to work with windows
|
||||||
|
z = true, -- bindings for folds, spelling and others prefixed with z
|
||||||
|
g = true, -- bindings for prefixed with g
|
||||||
|
},
|
||||||
|
},
|
||||||
|
icons = {
|
||||||
|
breadcrumb = '»', -- symbol used in the command line area that shows your active key combo
|
||||||
|
separator = '➜ ', -- symbol used between a key and it's label
|
||||||
|
group = '+', -- symbol prepended to a group
|
||||||
|
},
|
||||||
|
window = {
|
||||||
|
border = 'none', -- none, single, double, shadow
|
||||||
|
position = 'bottom', -- bottom, top
|
||||||
|
margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left]
|
||||||
|
padding = { 1, 1, 1, 1 }, -- extra window padding [top, right, bottom, left]
|
||||||
|
},
|
||||||
|
layout = {
|
||||||
|
height = { min = 4, max = 25 }, -- min and max height of the columns
|
||||||
|
width = { min = 20, max = 50 }, -- min and max width of the columns
|
||||||
|
spacing = 3, -- spacing between columns
|
||||||
|
},
|
||||||
|
hidden = { '<silent>', '<cmd>', '<Cmd>', '<CR>', 'call', 'lua', '^:', '^ ' }, -- hide mapping boilerplate
|
||||||
|
show_help = true, -- show help message on the command line when the popup is visible
|
||||||
|
}
|
||||||
|
|
||||||
|
local opts = {
|
||||||
|
mode = 'n', -- NORMAL mode
|
||||||
|
prefix = '<leader>',
|
||||||
|
buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
|
||||||
|
silent = true, -- use `silent` when creating keymaps
|
||||||
|
noremap = true, -- use `noremap` when creating keymaps
|
||||||
|
nowait = false, -- use `nowait` when creating keymaps
|
||||||
|
}
|
||||||
|
-- }}}
|
||||||
|
-- leader mappings {{{
|
||||||
|
-- TODO create entire treesitter section
|
||||||
|
local mappings = {
|
||||||
|
['<leader>'] = {'<cmd>Lf<cr>', 'Lf'},
|
||||||
|
['rr'] = 'Search and replace all',
|
||||||
|
['rs'] = 'Search and replace',
|
||||||
|
-- ["b"] = {"<cmd>FindrBuffers<cr>", "List buffers"},
|
||||||
|
['k'] = { '<cmd>bd!<cr>', 'Kill buffer' },
|
||||||
|
['n'] = { '<cmd>bn<cr>', 'Next buffer' },
|
||||||
|
['p'] = { '<cmd>bp<cr>', 'Next buffer' },
|
||||||
|
['h'] = { '<cmd>TSBufToggle highlight<cr>', 'Enable TS highlight' },
|
||||||
|
-- ['t'] = { '<cmd>ToggleTerm direction=horizontal<cr>', 'HTerminal' },
|
||||||
|
['T'] = { '<cmd>ToggleTerm direction=vertical<cr>', 'VTerminal' },
|
||||||
|
['D'] = 'Type definition',
|
||||||
|
['rn'] = 'Rename',
|
||||||
|
['ca'] = 'Code action',
|
||||||
|
['1'] = { '<cmd>b 1<cr>', 'Buffer 1' },
|
||||||
|
['2'] = { '<cmd>b 2<cr>', 'Buffer 2' },
|
||||||
|
['3'] = { '<cmd>b 3<cr>', 'Buffer 3' },
|
||||||
|
['4'] = { '<cmd>b 4<cr>', 'Buffer 4' },
|
||||||
|
['5'] = { '<cmd>b 5<cr>', 'Buffer 5' },
|
||||||
|
['g'] = { '<cmd>Lazygit<cr>', 'Lazygit' },
|
||||||
|
l = {
|
||||||
|
name = 'LSP',
|
||||||
|
f = 'Format',
|
||||||
|
i = 'Lsp Info',
|
||||||
|
a = 'Code action',
|
||||||
|
j = 'Next diagnostic',
|
||||||
|
k = 'Prev diagnostic',
|
||||||
|
r = 'Rename',
|
||||||
|
s = 'Signature Help',
|
||||||
|
q = 'Set LocList',
|
||||||
|
},
|
||||||
|
['<TAB>'] = {
|
||||||
|
name = 'Tab',
|
||||||
|
n = { '<cmd>tabnew<cr>', 'New' },
|
||||||
|
p = { '<cmd>tabp<cr>', 'Previous' },
|
||||||
|
d = { '<cmd>tabclose<cr>', 'Close' },
|
||||||
|
['<TAB>'] = { '<cmd>tabnext<cr>', 'Next' },
|
||||||
|
['1'] = { '1gt', 'Go to tab 1' },
|
||||||
|
['2'] = { '2gt', 'Go to tab 2' },
|
||||||
|
['3'] = { '3gt', 'Go to tab 3' },
|
||||||
|
['4'] = { '4gt', 'Go to tab 4' },
|
||||||
|
['5'] = { '5gt', 'Go to tab 5' },
|
||||||
|
['6'] = { '6gt', 'Go to tab 6' },
|
||||||
|
['7'] = { '7gt', 'Go to tab 7' },
|
||||||
|
['8'] = { '8gt', 'Go to tab 8' },
|
||||||
|
['9'] = { '9gt', 'Go to tab 9' },
|
||||||
|
},
|
||||||
|
w = {
|
||||||
|
name = 'Window',
|
||||||
|
v = { '<C-w>v', 'Vertical split' },
|
||||||
|
h = { '<C-w>s', 'Horizontal split' },
|
||||||
|
},
|
||||||
|
t = {
|
||||||
|
name = 'Telescope',
|
||||||
|
f = { '<cmd>Telescope find_files<cr>', 'Files' },
|
||||||
|
g = { '<cmd>Telescope live_grep<cr>', 'Grep' },
|
||||||
|
b = { '<cmd>Telescope buffers<cr>', 'Buffers' },
|
||||||
|
t = { '<cmd>Telescope<cr>', 'Pickers' },
|
||||||
|
r = { '<cmd>Telescope lsp_references<cr>', 'Lsp references' },
|
||||||
|
},
|
||||||
|
-- d = {
|
||||||
|
-- name = 'DAP',
|
||||||
|
-- b = { "<cmd>lua require'dap'.toggle_breakpoint()<cr>", 'Toggle breakpoint' },
|
||||||
|
-- c = { "<md>lua require'dap'.continue()<cr>", 'Continue' },
|
||||||
|
-- i = { "<cmd>lua require'dap'.step_into()<cr>", 'Step into' },
|
||||||
|
-- o = { "<cmd>lua require'dap'.step_over()<cr>", 'Step over' },
|
||||||
|
-- O = { "<cmd>lua require'dap'.step_out()<cr>", 'Step out' },
|
||||||
|
-- r = { "<cmd>lua require'dap'.repl_toggle()<cr>", 'Toggle repl' },
|
||||||
|
-- l = { "<cmd>lua require'dap'.run_last()<cr>", 'Run last' },
|
||||||
|
-- u = { "<cmd>lua require'dapui'.toggle()<cr>", 'UI' },
|
||||||
|
-- t = { "<cmd>lua require'dap'.terminate()<cr>", 'Terminate' },
|
||||||
|
-- },
|
||||||
|
}
|
||||||
|
-- }}}
|
||||||
|
wk.register(mappings, opts)
|
||||||
|
|||||||
@ -1,138 +0,0 @@
|
|||||||
local M = {
|
|
||||||
'folke/which-key.nvim',
|
|
||||||
lazy = false,
|
|
||||||
-- event = "VeryLazy",
|
|
||||||
}
|
|
||||||
|
|
||||||
function M.config()
|
|
||||||
local wk = require 'which-key'
|
|
||||||
|
|
||||||
-- which-key {{{
|
|
||||||
wk.setup {
|
|
||||||
plugins = {
|
|
||||||
marks = true, -- shows a list of your marks on ' and `
|
|
||||||
registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode
|
|
||||||
-- the presets plugin, adds help for a bunch of default keybindings in Neovim
|
|
||||||
-- No actual key bindings are created
|
|
||||||
presets = {
|
|
||||||
operators = true, -- adds help for operators like d, y, ...
|
|
||||||
motions = true, -- adds help for motions
|
|
||||||
text_objects = false, -- help for text objects triggered after entering an operator
|
|
||||||
windows = true, -- default bindings on <c-w>
|
|
||||||
nav = true, -- misc bindings to work with windows
|
|
||||||
z = true, -- bindings for folds, spelling and others prefixed with z
|
|
||||||
g = true, -- bindings for prefixed with g
|
|
||||||
},
|
|
||||||
},
|
|
||||||
icons = {
|
|
||||||
breadcrumb = '»', -- symbol used in the command line area that shows your active key combo
|
|
||||||
separator = '➜ ', -- symbol used between a key and it's label
|
|
||||||
group = '+', -- symbol prepended to a group
|
|
||||||
},
|
|
||||||
window = {
|
|
||||||
border = 'none', -- none, single, double, shadow
|
|
||||||
position = 'bottom', -- bottom, top
|
|
||||||
margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left]
|
|
||||||
padding = { 1, 1, 1, 1 }, -- extra window padding [top, right, bottom, left]
|
|
||||||
},
|
|
||||||
layout = {
|
|
||||||
height = { min = 4, max = 25 }, -- min and max height of the columns
|
|
||||||
width = { min = 20, max = 50 }, -- min and max width of the columns
|
|
||||||
spacing = 3, -- spacing between columns
|
|
||||||
},
|
|
||||||
hidden = { '<silent>', '<cmd>', '<Cmd>', '<CR>', 'call', 'lua', '^:', '^ ' }, -- hide mapping boilerplate
|
|
||||||
show_help = true, -- show help message on the command line when the popup is visible
|
|
||||||
}
|
|
||||||
|
|
||||||
local opts = {
|
|
||||||
mode = 'n', -- NORMAL mode
|
|
||||||
prefix = '<leader>',
|
|
||||||
buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings
|
|
||||||
silent = true, -- use `silent` when creating keymaps
|
|
||||||
noremap = true, -- use `noremap` when creating keymaps
|
|
||||||
nowait = false, -- use `nowait` when creating keymaps
|
|
||||||
}
|
|
||||||
-- }}}
|
|
||||||
-- leader mappings {{{
|
|
||||||
-- TODO create entire treesitter section
|
|
||||||
local mappings = {
|
|
||||||
['rr'] = 'Search and replace all',
|
|
||||||
['rs'] = 'Search and replace',
|
|
||||||
-- ["b"] = {"<cmd>FindrBuffers<cr>", "List buffers"},
|
|
||||||
['k'] = { '<cmd>bd!<cr>', 'Kill buffer' },
|
|
||||||
['n'] = { '<cmd>bn<cr>', 'Next buffer' },
|
|
||||||
['p'] = { '<cmd>bp<cr>', 'Next buffer' },
|
|
||||||
['h'] = { '<cmd>TSBufToggle highlight<cr>', 'Enable TS highlight' },
|
|
||||||
-- ['t'] = { '<cmd>ToggleTerm direction=horizontal<cr>', 'HTerminal' },
|
|
||||||
['T'] = { '<cmd>ToggleTerm direction=vertical<cr>', 'VTerminal' },
|
|
||||||
['D'] = 'Type definition',
|
|
||||||
['rn'] = 'Rename',
|
|
||||||
['ca'] = 'Code action',
|
|
||||||
['1'] = { '<cmd>b 1<cr>', 'Buffer 1' },
|
|
||||||
['2'] = { '<cmd>b 2<cr>', 'Buffer 2' },
|
|
||||||
['3'] = { '<cmd>b 3<cr>', 'Buffer 3' },
|
|
||||||
['4'] = { '<cmd>b 4<cr>', 'Buffer 4' },
|
|
||||||
['5'] = { '<cmd>b 5<cr>', 'Buffer 5' },
|
|
||||||
['g'] = { '<cmd>LazyGit<cr>', 'Lazygit' },
|
|
||||||
l = {
|
|
||||||
name = 'LSP',
|
|
||||||
f = 'Format',
|
|
||||||
i = 'Lsp Info',
|
|
||||||
I = 'Lsp Install Info',
|
|
||||||
a = 'Code action',
|
|
||||||
j = 'Next diagnostic',
|
|
||||||
k = 'Prev diagnostic',
|
|
||||||
r = 'Rename',
|
|
||||||
s = 'Signature Help',
|
|
||||||
q = 'Set LocList',
|
|
||||||
},
|
|
||||||
['<TAB>'] = {
|
|
||||||
name = 'Tab',
|
|
||||||
n = { '<cmd>tabnew<cr>', 'New' },
|
|
||||||
p = { '<cmd>tabp<cr>', 'Previous' },
|
|
||||||
d = { '<cmd>tabclose<cr>', 'Close' },
|
|
||||||
['<TAB>'] = { '<cmd>tabnext<cr>', 'Next' },
|
|
||||||
['1'] = { '1gt', 'Go to tab 1' },
|
|
||||||
['2'] = { '2gt', 'Go to tab 2' },
|
|
||||||
['3'] = { '3gt', 'Go to tab 3' },
|
|
||||||
['4'] = { '4gt', 'Go to tab 4' },
|
|
||||||
['5'] = { '5gt', 'Go to tab 5' },
|
|
||||||
['6'] = { '6gt', 'Go to tab 6' },
|
|
||||||
['7'] = { '7gt', 'Go to tab 7' },
|
|
||||||
['8'] = { '8gt', 'Go to tab 8' },
|
|
||||||
['9'] = { '9gt', 'Go to tab 9' },
|
|
||||||
},
|
|
||||||
w = {
|
|
||||||
name = 'Window',
|
|
||||||
v = { '<C-w>v', 'Vertical split' },
|
|
||||||
h = { '<C-w>s', 'Horizontal split' },
|
|
||||||
a = 'Add workspace folder',
|
|
||||||
r = 'Remove workspace folder',
|
|
||||||
l = 'List workspace folders',
|
|
||||||
},
|
|
||||||
t = {
|
|
||||||
name = 'Telescope',
|
|
||||||
f = { '<cmd>Telescope find_files<cr>', 'Files' },
|
|
||||||
g = { '<cmd>Telescope live_grep<cr>', 'Grep' },
|
|
||||||
b = { '<cmd>Telescope buffers<cr>', 'Buffers' },
|
|
||||||
t = { '<cmd>Telescope<cr>', 'Pickers' },
|
|
||||||
r = { '<cmd>Telescope lsp_references<cr>', 'Lsp references' },
|
|
||||||
},
|
|
||||||
-- d = {
|
|
||||||
-- name = 'DAP',
|
|
||||||
-- b = { "<cmd>lua require'dap'.toggle_breakpoint()<cr>", 'Toggle breakpoint' },
|
|
||||||
-- c = { "<md>lua require'dap'.continue()<cr>", 'Continue' },
|
|
||||||
-- i = { "<cmd>lua require'dap'.step_into()<cr>", 'Step into' },
|
|
||||||
-- o = { "<cmd>lua require'dap'.step_over()<cr>", 'Step over' },
|
|
||||||
-- O = { "<cmd>lua require'dap'.step_out()<cr>", 'Step out' },
|
|
||||||
-- r = { "<cmd>lua require'dap'.repl_toggle()<cr>", 'Toggle repl' },
|
|
||||||
-- l = { "<cmd>lua require'dap'.run_last()<cr>", 'Run last' },
|
|
||||||
-- u = { "<cmd>lua require'dapui'.toggle()<cr>", 'UI' },
|
|
||||||
-- t = { "<cmd>lua require'dap'.terminate()<cr>", 'Terminate' },
|
|
||||||
-- },
|
|
||||||
}
|
|
||||||
-- }}}
|
|
||||||
wk.register(mappings, opts)
|
|
||||||
end
|
|
||||||
|
|
||||||
return M
|
|
||||||
Loading…
x
Reference in New Issue
Block a user