diff --git a/nvim/init.lua b/nvim/init.lua index def280a..61a2d06 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -338,16 +338,12 @@ require('lazy').setup({ fzf.grep { search = vim.fn.expand '%:t' } end - local fzf_git_history = function() + local fzf_git_chronology = function() fzf.files { cmd = "git log --name-only --pretty=\"\" | sed -e '/^\\s*$/d' | awk '!seen[$0]++'" } end --[[ cfg_lazy_fzf_keymaps ]] - vim.keymap.set({ 'n' }, 'gr', fzf.lsp_references, { desc = 'LSP: [G]o to fzf [R]eference list' }) - vim.keymap.set({ 'n' }, 'fu', fzf_grep_filename, { desc = '[F]zf: current file [U]sages' }) - - vim.keymap.set({ 'n' }, 'fp', fzf.builtin, { desc = '[F]zf: [p]allete' }) vim.keymap.set({ 'n' }, 'f.', fzf.resume, { desc = '[F]zf: Resume' }) vim.keymap.set({ 'n' }, 'b', fzf.buffers, { desc = '[F]zf: [B]uffers' }) @@ -355,17 +351,23 @@ require('lazy').setup({ vim.keymap.set({ 'n' }, 'fF', fzf_files, { desc = '[F]zf: all [F]iles' }) vim.keymap.set({ 'n' }, 'ff', fzf.git_files, { desc = '[F]zf: git [f]iles' }) vim.keymap.set({ 'n' }, 'fd', fzf.git_status, { desc = '[F]zf: git [d]iff' }) - vim.keymap.set({ 'n' }, 'fh', fzf_git_history, { desc = '[F]zf: git [h]istory' }) + vim.keymap.set({ 'n' }, 'fh', fzf_git_chronology, { desc = '[F]zf: git c[h]ronology' }) + vim.keymap.set({ 'n' }, 'f/', fzf.blines, { desc = '[F]zf: buffer lines' }) vim.keymap.set({ 'n' }, 'fg', fzf.live_grep, { desc = '[F]zf: [g]rep' }) vim.keymap.set({ 'n' }, 'fw', fzf.grep_cword, { desc = '[F]zf: grep [w]' }) vim.keymap.set({ 'n' }, 'fW', fzf.grep_cWORD, { desc = '[F]zf: grep [W]' }) + vim.keymap.set({ 'n' }, 'fp', fzf.builtin, { desc = '[F]zf: [p]allete' }) vim.keymap.set({ 'n' }, 'p', fzf.registers, { desc = '[F]zf: [p]aste' }) - vim.keymap.set({ 'n' }, '/', fzf.blines, { desc = '[F]zf: buffer lines' }) - vim.keymap.set({ 'n' }, 'f?', fzf.keymaps, { desc = '[F]zf: keymaps' }) - vim.keymap.set({ 'n' }, 'f/', fzf.search_history, { desc = '[F]zf: search history' }) - vim.keymap.set({ 'n' }, 'f:', fzf.command_history, { desc = '[F]zf: command history' }) + vim.keymap.set({ 'n' }, '?', fzf.keymaps, { desc = '[F]zf: keymaps' }) + vim.keymap.set({ 'n' }, '/', fzf.search_history, { desc = '[F]zf: search history' }) + vim.keymap.set({ 'n' }, ':', fzf.command_history, { desc = '[F]zf: command history' }) + + -- LSP + vim.keymap.set({ 'n' }, 'gr', fzf.lsp_references, { desc = 'LSP: [G]o to fzf [R]eference list' }) + vim.keymap.set({ 'n' }, 'gd', fzf.lsp_definitions, { desc = 'LSP: [G]oto [d]efinition list' }) + vim.keymap.set({ 'n' }, 'fu', fzf_grep_filename, { desc = '[F]zf: current file [U]sages' }) end, }, --[[ cfg_lazy_lsp: LSP configuration & plugins ]] @@ -435,15 +437,17 @@ require('lazy').setup({ vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc }) end + -- See also cfg_lazy_fzf_keymaps + nmap('K', vim.lsp.buf.hover, 'Hover Documentation') nmap('', vim.lsp.buf.signature_help, 'Signature Documentation') nmap('rn', vim.lsp.buf.rename, '[R]e[n]ame') nmap('ca', vim.lsp.buf.code_action, '[C]ode [A]tion') - nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition') - nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - nmap('gD', vim.lsp.buf.type_definition, 'Type Definition') + nmap('gd', vim.lsp.buf.definition, '[G]oto [d]efinition') + nmap('gD', vim.lsp.buf.type_definition, '[G]oto type [D]efinition') + nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') nmap('ea', vim.lsp.buf.add_workspace_folder, 'Workspac[e] [A]dd Folder') nmap('er', vim.lsp.buf.remove_workspace_folder, 'Workspac[e] [R]emove Folder')