mirror of
https://github.com/tiyn/dotfiles.git
synced 2025-10-10 19:41:15 +02:00
nvim: fixed some wilder and which-key functionalities
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
-- setup keymap function
|
||||
local m = require 'mapx'.setup { global = true, whichkey = true }
|
||||
local m = require("mapx").setup({ global = true, whichkey = true })
|
||||
|
||||
-- setup keymap groups
|
||||
m.nname("g", "LSP: goto")
|
||||
@@ -14,71 +14,91 @@ m.nname("<leader>t", "Terminal")
|
||||
m.nname("<C-W>", "Navigation")
|
||||
|
||||
-- unmap unwanted commands
|
||||
m.nnoremap("Zt", '<NOP>')
|
||||
m.nnoremap("ZT", '<NOP>')
|
||||
m.nnoremap("<Space>", '<NOP>')
|
||||
m.inoremap("<F2>", '<NOP>')
|
||||
m.inoremap("<F3>", '<NOP>')
|
||||
m.inoremap("<F4>", '<NOP>')
|
||||
m.inoremap("<F5>", '<NOP>')
|
||||
m.inoremap("<F6>", '<NOP>')
|
||||
m.inoremap("<F8>", '<NOP>')
|
||||
m.inoremap("<F9>", '<NOP>')
|
||||
m.nnoremap("<F9>", '<NOP>')
|
||||
m.inoremap("<F10>", '<NOP>')
|
||||
m.nnoremap("<F10>", '<NOP>')
|
||||
m.inoremap("<F11>", '<NOP>')
|
||||
m.nnoremap("<F11>", '<NOP>')
|
||||
m.inoremap("<F12>", '<NOP>')
|
||||
m.nnoremap("<F12>", '<NOP>')
|
||||
m.nnoremap("Zt", "<NOP>")
|
||||
m.nnoremap("ZT", "<NOP>")
|
||||
m.nnoremap("<Space>", "<NOP>")
|
||||
m.inoremap("<F2>", "<NOP>")
|
||||
m.inoremap("<F3>", "<NOP>")
|
||||
m.inoremap("<F4>", "<NOP>")
|
||||
m.inoremap("<F5>", "<NOP>")
|
||||
m.inoremap("<F6>", "<NOP>")
|
||||
m.inoremap("<F8>", "<NOP>")
|
||||
m.inoremap("<F9>", "<NOP>")
|
||||
m.nnoremap("<F9>", "<NOP>")
|
||||
m.inoremap("<F10>", "<NOP>")
|
||||
m.nnoremap("<F10>", "<NOP>")
|
||||
m.inoremap("<F11>", "<NOP>")
|
||||
m.nnoremap("<F11>", "<NOP>")
|
||||
m.inoremap("<F12>", "<NOP>")
|
||||
m.nnoremap("<F12>", "<NOP>")
|
||||
|
||||
-- spell
|
||||
m.nmap("<F6>s", "z=", "Spell: display suggestions")
|
||||
|
||||
-- shortcuts for quitting
|
||||
m.nnoremap("ZA", ':xa<CR>', 'Exit: write and quit all buffers')
|
||||
m.nnoremap("ZQ", ':conf q<CR>', 'Exit: quit current buffer')
|
||||
m.nnoremap("ZZ", ':x<CR>', 'Exit: write and quit current buffer')
|
||||
m.nnoremap("ZA", ":xa<CR>", "Exit: write and quit all buffers")
|
||||
m.nnoremap("ZQ", ":conf q<CR>", "Exit: quit current buffer")
|
||||
m.nnoremap("ZZ", ":x<CR>", "Exit: write and quit current buffer")
|
||||
|
||||
-- shortcut for split navigation
|
||||
m.nnoremap("<C-h>", '<C-w>h', 'Navigation: go to left window')
|
||||
m.nnoremap("<C-j>", '<C-w>j', 'Navigation: go to lower window')
|
||||
m.nnoremap("<C-k>", '<C-w>k', 'Navigation: go to upper window')
|
||||
m.nnoremap("<C-l>", '<C-w>l', 'Navigation: go to right window')
|
||||
m.nnoremap("<C-h>", "<C-w>h", "Navigation: go to left window")
|
||||
m.nnoremap("<C-j>", "<C-w>j", "Navigation: go to lower window")
|
||||
m.nnoremap("<C-k>", "<C-w>k", "Navigation: go to upper window")
|
||||
m.nnoremap("<C-l>", "<C-w>l", "Navigation: go to right window")
|
||||
|
||||
-- remap for dealing with word wrap
|
||||
m.nmap('j', "v:count == 0 ? 'gj' : 'j'", { "expr", "silent" }, 'Navigation: go down in wrapped lines')
|
||||
m.nmap('k', "v:count == 0 ? 'gk' : 'k'", { "expr", "silent" }, 'Navigation: go up in wrapped lines')
|
||||
m.nmap(
|
||||
"j",
|
||||
"v:count == 0 ? 'gj' : 'j'",
|
||||
{ "expr", "silent" },
|
||||
"Navigation: go down in wrapped lines"
|
||||
)
|
||||
m.nmap("k", "v:count == 0 ? 'gk' : 'k'", { "expr", "silent" }, "Navigation: go up in wrapped lines")
|
||||
|
||||
-- compiler for languages
|
||||
m.nnoremap("<leader>c", ':w! | !compiler <c-r>%<CR>', 'Compile: current file')
|
||||
m.nnoremap("<leader>c", ":w! | !compiler <c-r>%<CR>", "Compile: current file")
|
||||
|
||||
-- save file as sudo on files that require root permission
|
||||
m.cnoremap("w!!", 'execute "silent! write !sudo tee % >/dev/null" <bar> edit!', 'Write: overwrite file over with sudo')
|
||||
m.cnoremap(
|
||||
"w!!",
|
||||
'execute "silent! write !sudo tee % >/dev/null" <bar> edit!',
|
||||
"Write: overwrite file over with sudo"
|
||||
)
|
||||
|
||||
-- tpope/vim-abolish
|
||||
m.nnoremap("<leader>sa", ':%S//g<Left><Left>', 'Substitute: free form')
|
||||
m.nnoremap("<leader>ss", ':%S/\\<<C-r><C-w>\\>//g<Left><Left>', 'Substitute: word under cursor')
|
||||
m.nnoremap("<leader>sa", ":%S//g<Left><Left>", "Substitute: free form")
|
||||
m.nnoremap("<leader>ss", ":%S/\\<<C-r><C-w>\\>//g<Left><Left>", "Substitute: word under cursor")
|
||||
|
||||
-- simrat39/symbols-outline.nvim
|
||||
m.nmap('<F3>', ':SymbolsOutline<CR>', 'CTags: toggle')
|
||||
m.nmap("<F3>", ":SymbolsOutline<CR>", "CTags: toggle")
|
||||
|
||||
-- nvim-tree/nvim-tree.lua
|
||||
m.nmap("<F2>", ':NvimTreeToggle toggle<CR>', 'File tree: toggle')
|
||||
m.nmap("<F2>", ":NvimTreeToggle toggle<CR>", "File tree: toggle")
|
||||
|
||||
-- mbbill/undotree
|
||||
m.nmap("<F1>", ':UndotreeToggle<CR>', 'Undo tree: toggle')
|
||||
m.nmap("<F1>", ":UndotreeToggle<CR>", "Undo tree: toggle")
|
||||
|
||||
-- amrbashir/nvim-docs-view
|
||||
m.nnoremap("go", ':DocsViewToggle<CR>', 'LSP: toggle documentation window')
|
||||
m.nnoremap("go", ":DocsViewToggle<CR>", "LSP: toggle documentation window")
|
||||
|
||||
-- numtostr/fterm.nvim
|
||||
m.nnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: open')
|
||||
m.tnoremap("<leader>tt", require("FTerm").toggle, 'Terminal: open')
|
||||
m.nnoremap("<leader>tt", require("FTerm").toggle, "Terminal: open")
|
||||
m.tnoremap("<leader>tt", require("FTerm").toggle, "Terminal: open")
|
||||
local lazygit = require("FTerm"):new({
|
||||
cmd = 'lazygit',
|
||||
cmd = "lazygit",
|
||||
})
|
||||
m.nnoremap("<leader>gt", function() lazygit:toggle() end, 'Git: open lazygit')
|
||||
m.tnoremap("<leader>gt", function() lazygit:toggle() end, 'Git: open lazygit')
|
||||
m.nnoremap("<leader>tg", function() lazygit:toggle() end, 'Terminal: open lazygit')
|
||||
m.tnoremap("<leader>tg", function() lazygit:toggle() end, 'Terminal: open lazygit')
|
||||
m.nnoremap("<leader>gt", function()
|
||||
lazygit:toggle()
|
||||
end, "Git: open lazygit")
|
||||
m.tnoremap("<leader>gt", function()
|
||||
lazygit:toggle()
|
||||
end, "Git: open lazygit")
|
||||
m.nnoremap("<leader>tg", function()
|
||||
lazygit:toggle()
|
||||
end, "Terminal: open lazygit")
|
||||
m.tnoremap("<leader>tg", function()
|
||||
lazygit:toggle()
|
||||
end, "Terminal: open lazygit")
|
||||
|
||||
-- sindrets/diffview.nvim
|
||||
m.nmap("<leader>gdo", ":DiffviewOpen<CR>", "Git: open diff")
|
||||
@@ -91,42 +111,78 @@ m.nmap("<leader>x", ":TroubleToggle<CR>", "LSP: toggle error list")
|
||||
m.nnoremap("gd", vim.lsp.buf.definition(), "LSP: goto definition")
|
||||
m.nnoremap("gD", vim.lsp.buf.declaration(), "LSP: goto declaration")
|
||||
m.nnoremap("gi", vim.lsp.buf.implementation(), "LSP: list implementation")
|
||||
m.nnoremap("gr", function() vim.lsp.buf.references() end, "LSP: list references")
|
||||
m.nnoremap("gr", function()
|
||||
vim.lsp.buf.references()
|
||||
end, "LSP: list references")
|
||||
m.nnoremap("gy", vim.lsp.buf.type_definition(), "LSP: goto type definition")
|
||||
m.nnoremap("K", vim.lsp.buf.hover(), "LSP: show documentation")
|
||||
m.nnoremap("<F8>", function() require("conform").format({ async = true, lsp_fallback = true }) end, "LSP: format")
|
||||
m.nnoremap("<F8>", function()
|
||||
require("conform").format({ async = true, lsp_fallback = true })
|
||||
end, "LSP: format")
|
||||
|
||||
-- rmagatti/goto-preview
|
||||
m.nnoremap("gpd", function() require('goto-preview').goto_preview_definition() end, "LSP: preview definition")
|
||||
m.nnoremap("gpy", function() require('goto-preview').goto_preview_type_definition() end, "LSP: preview type definition")
|
||||
m.nnoremap("gpi", function() require('goto-preview').goto_preview_implementation() end, "LSP: list preview implementation")
|
||||
m.nnoremap("gpD", function() require('goto-preview').goto_preview_declaration() end, "LSP: preview declaration")
|
||||
m.nnoremap("gpr", function() require('goto-preview').goto_preview_references() end, "LSP: list preview references")
|
||||
m.nnoremap("gpc", function() require('goto-preview').close_all_win() end, "LSP: close all preview windows")
|
||||
m.nnoremap("gpd", function()
|
||||
require("goto-preview").goto_preview_definition()
|
||||
end, "LSP: preview definition")
|
||||
m.nnoremap("gpy", function()
|
||||
require("goto-preview").goto_preview_type_definition()
|
||||
end, "LSP: preview type definition")
|
||||
m.nnoremap("gpi", function()
|
||||
require("goto-preview").goto_preview_implementation()
|
||||
end, "LSP: list preview implementation")
|
||||
m.nnoremap("gpD", function()
|
||||
require("goto-preview").goto_preview_declaration()
|
||||
end, "LSP: preview declaration")
|
||||
m.nnoremap("gpr", function()
|
||||
require("goto-preview").goto_preview_references()
|
||||
end, "LSP: list preview references")
|
||||
m.nnoremap("gpc", function()
|
||||
require("goto-preview").close_all_win()
|
||||
end, "LSP: close all preview windows")
|
||||
|
||||
-- filipdutescu/renamer.nvim
|
||||
m.nnoremap("<F5>", function() require("renamer").rename() end, "LSP: rename")
|
||||
m.nnoremap("<F5>", function()
|
||||
require("renamer").rename()
|
||||
end, "LSP: rename")
|
||||
|
||||
-- nvim-telescope/telescope.nvim
|
||||
m.nnoremap("<F4>", ':Telescope find_files<CR>', "Telescope: find files")
|
||||
m.nnoremap("<leader>ff", ':Telescope find_files<CR>', "Telescope: find files")
|
||||
m.nnoremap("<F4>", ":Telescope find_files<CR>", "Telescope: find files")
|
||||
m.nnoremap("<leader>ff", ":Telescope find_files<CR>", "Telescope: find files")
|
||||
|
||||
-- kamykn/spelunker.vim
|
||||
m.nnoremap("<F6>", ':call spelunker#toggle()<CR>', "Spelling: toggle spell check")
|
||||
m.nnoremap("<F6>t", ":call spelunker#toggle()<CR>", "Spelunker: toggle spell check")
|
||||
m.nnoremap("<F6>l", function()
|
||||
if vim.opt.spelllang._value == "de_de" then
|
||||
vim.opt.spelllang = "en_us"
|
||||
print("Spell language set to en_us")
|
||||
else
|
||||
vim.opt.spelllang = "de_de"
|
||||
print("Spell language set to de_de")
|
||||
end
|
||||
vim.opt.spell = false
|
||||
end, "Spell: toggle spell language")
|
||||
|
||||
-- kevinhwang91/nvim-ufo
|
||||
m.nnoremap("K", function()
|
||||
local winid = require('ufo').peekFoldedLinesUnderCursor()
|
||||
local winid = require("ufo").peekFoldedLinesUnderCursor()
|
||||
if not winid then
|
||||
vim.lsp.buf.hover()
|
||||
end
|
||||
end, "LSP: peek folded section")
|
||||
|
||||
-- kevinhwang91/nvim-hlslens
|
||||
m.nnoremap("n", [[<Cmd>execute('normal! ' . v:count1 . 'n')<CR><Cmd>lua require('hlslens').start()<CR>]],
|
||||
'silent', "Search: search forward")
|
||||
m.nnoremap("N", [[<Cmd>execute('normal! ' . v:count1 . 'N')<CR><Cmd>lua require('hlslens').start()<CR>]],
|
||||
'silent', "Search: search backwards")
|
||||
m.nnoremap(
|
||||
"n",
|
||||
[[<Cmd>execute('normal! ' . v:count1 . 'n')<CR><Cmd>lua require('hlslens').start()<CR>]],
|
||||
"silent",
|
||||
"Search: search forward"
|
||||
)
|
||||
m.nnoremap(
|
||||
"N",
|
||||
[[<Cmd>execute('normal! ' . v:count1 . 'N')<CR><Cmd>lua require('hlslens').start()<CR>]],
|
||||
"silent",
|
||||
"Search: search backwards"
|
||||
)
|
||||
|
||||
-- sindrets/winshift.nvim
|
||||
m.nnoremap("<C-W>m", ":WinShift<CR>", "Navigation: enter window shift mode")
|
||||
@@ -137,4 +193,6 @@ m.nnoremap("S", "<Plug>(leap-backward)", "Navigation: enter leap mode for backwa
|
||||
m.nnoremap("gs", "<Plug>(leap-from-window", "Navigation: enter leap mode for other windows")
|
||||
|
||||
-- gnikdroy/projections.nvim
|
||||
m.nnoremap("<leader>fp", function() vim.cmd("Telescope projections") end, "Telescope: find projects")
|
||||
m.nnoremap("<leader>fp", function()
|
||||
vim.cmd("Telescope projections")
|
||||
end, "Telescope: find projects")
|
||||
|
||||
@@ -1,35 +1,36 @@
|
||||
return {
|
||||
-- improved wild menu
|
||||
{
|
||||
'gelguy/wilder.nvim',
|
||||
"gelguy/wilder.nvim",
|
||||
dependencies = {
|
||||
{
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
lazy = true
|
||||
lazy = true,
|
||||
},
|
||||
'roxma/nvim-yarp',
|
||||
'roxma/vim-hug-neovim-rpc',
|
||||
'romgrk/fzy-lua-native'
|
||||
"roxma/nvim-yarp",
|
||||
"roxma/vim-hug-neovim-rpc",
|
||||
"romgrk/fzy-lua-native",
|
||||
"nixprime/cpsm",
|
||||
},
|
||||
config = function()
|
||||
local wilder = require('wilder')
|
||||
local wilder = require("wilder")
|
||||
wilder.setup({
|
||||
modes = {':', '/', '?'},
|
||||
accept_key = '<CR>',
|
||||
reject_key = '<C-e>'
|
||||
modes = { ":", "/", "?" },
|
||||
accept_key = "<CR>",
|
||||
reject_key = "<C-e>",
|
||||
})
|
||||
wilder.set_option('pipeline', {
|
||||
wilder.set_option("pipeline", {
|
||||
wilder.branch(
|
||||
wilder.python_file_finder_pipeline({
|
||||
file_command = function(ctx, arg)
|
||||
if string.find(arg, '.') ~= nil then
|
||||
return {'fd', '-tf', '-H'}
|
||||
if string.find(arg, ".") ~= nil then
|
||||
return { "fd", "-tf", "-H" }
|
||||
else
|
||||
return {'fd', '-tf'}
|
||||
return { "fd", "-tf" }
|
||||
end
|
||||
end,
|
||||
dir_command = {'fd', '-td'},
|
||||
filters = {'cpsm_filter'},
|
||||
dir_command = { "fd", "-td" },
|
||||
filters = { "cpsm_filter" },
|
||||
}),
|
||||
wilder.substitute_pipeline({
|
||||
pipeline = wilder.python_search_pipeline({
|
||||
@@ -44,7 +45,9 @@ return {
|
||||
fuzzy_filter = wilder.lua_fzy_filter(),
|
||||
}),
|
||||
{
|
||||
wilder.check(function(ctx, x) return x == '' end),
|
||||
wilder.check(function(ctx, x)
|
||||
return x == ""
|
||||
end),
|
||||
wilder.history(),
|
||||
},
|
||||
wilder.python_search_pipeline({
|
||||
@@ -58,11 +61,14 @@ return {
|
||||
wilder.pcre2_highlighter(),
|
||||
wilder.lua_fzy_highlighter(),
|
||||
}
|
||||
wilder.set_option('renderer', wilder.popupmenu_renderer({
|
||||
highlighter = highlighters,
|
||||
left = { ' ', wilder.popupmenu_devicons() },
|
||||
right = { ' ', wilder.popupmenu_scrollbar() },
|
||||
}))
|
||||
wilder.set_option(
|
||||
"renderer",
|
||||
wilder.popupmenu_renderer({
|
||||
highlighter = highlighters,
|
||||
left = { " ", wilder.popupmenu_devicons() },
|
||||
right = { " ", wilder.popupmenu_scrollbar() },
|
||||
})
|
||||
)
|
||||
end,
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user