switch to snacks picker
This commit is contained in:
parent
fff9f428f9
commit
5ec3e6623d
@ -123,4 +123,5 @@ return {
|
|||||||
desc = 'Fuzzy complete path',
|
desc = 'Fuzzy complete path',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
enabled = false
|
||||||
}
|
}
|
||||||
|
@ -1,13 +1,9 @@
|
|||||||
local lspKeys = function(client, bufnr)
|
local lspKeys = function(client, bufnr)
|
||||||
local fzf = require('fzf-lua')
|
|
||||||
local options = { noremap = true, silent = false, buffer = bufnr }
|
local options = { noremap = true, silent = false, buffer = bufnr }
|
||||||
vim.keymap.set('n', '<space>,', vim.diagnostic.goto_prev, vim.tbl_extend('error', options, { desc = 'Diag prev' }))
|
vim.keymap.set('n', '<space>,', vim.diagnostic.goto_prev, vim.tbl_extend('error', options, { desc = 'Diag prev' }))
|
||||||
vim.keymap.set('n', '<space>;', vim.diagnostic.goto_next, vim.tbl_extend('error', options, { desc = 'Diag next' }))
|
vim.keymap.set('n', '<space>;', vim.diagnostic.goto_next, vim.tbl_extend('error', options, { desc = 'Diag next' }))
|
||||||
vim.keymap.set({ 'n', 'x' }, '<space>a', vim.lsp.buf.code_action,
|
vim.keymap.set({ 'n', 'x' }, '<space>a', vim.lsp.buf.code_action,
|
||||||
vim.tbl_extend('error', options, { desc = 'Code action' }))
|
vim.tbl_extend('error', options, { desc = 'Code action' }))
|
||||||
vim.keymap.set('n', '<space>d', function()
|
|
||||||
fzf.lsp_definitions({ jump_to_single_result = true })
|
|
||||||
end, vim.tbl_extend('error', options, { desc = 'Definition' }))
|
|
||||||
vim.keymap.set('n', '<space>e', vim.lsp.buf.declaration, vim.tbl_extend('error', options, { desc = 'Declaration' }))
|
vim.keymap.set('n', '<space>e', vim.lsp.buf.declaration, vim.tbl_extend('error', options, { desc = 'Declaration' }))
|
||||||
vim.keymap.set('n', '<space>h', function()
|
vim.keymap.set('n', '<space>h', function()
|
||||||
require('pretty_hover').hover()
|
require('pretty_hover').hover()
|
||||||
@ -17,19 +13,12 @@ local lspKeys = function(client, bufnr)
|
|||||||
vim.keymap.set('n', '<space>C', vim.lsp.buf.incoming_calls,
|
vim.keymap.set('n', '<space>C', vim.lsp.buf.incoming_calls,
|
||||||
vim.tbl_extend('error', options, { desc = 'Incoming calls' }))
|
vim.tbl_extend('error', options, { desc = 'Incoming calls' }))
|
||||||
vim.keymap.set('n', '<space>m', vim.lsp.buf.rename, vim.tbl_extend('error', options, { desc = 'Rename' }))
|
vim.keymap.set('n', '<space>m', vim.lsp.buf.rename, vim.tbl_extend('error', options, { desc = 'Rename' }))
|
||||||
vim.keymap.set('n', '<C-t>', fzf.lsp_live_workspace_symbols,
|
|
||||||
vim.tbl_extend('error', options, { desc = 'Workspace symbols' }))
|
|
||||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition,
|
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition,
|
||||||
vim.tbl_extend('error', options, { desc = 'Type definition' }))
|
vim.tbl_extend('error', options, { desc = 'Type definition' }))
|
||||||
vim.keymap.set({ 'n', 'i', 'x' }, '<C-k>', vim.lsp.buf.signature_help,
|
vim.keymap.set({ 'n', 'i', 'x' }, '<C-k>', vim.lsp.buf.signature_help,
|
||||||
vim.tbl_extend('error', options, { desc = 'Signature help' }))
|
vim.tbl_extend('error', options, { desc = 'Signature help' }))
|
||||||
vim.keymap.set('n', '<space>r', fzf.lsp_references, vim.tbl_extend('error', options, { desc = 'References' }))
|
|
||||||
vim.keymap.set('n', '<A-m>', fzf.lsp_document_symbols, vim.tbl_extend('error', options, { desc = 'Document symbols' }))
|
|
||||||
vim.keymap.set('n', '<space>w', fzf.lsp_live_workspace_symbols,
|
|
||||||
vim.tbl_extend('error', options, { desc = 'Workspace symbols' }))
|
|
||||||
vim.keymap.set('n', '<space>v', vim.diagnostic.open_float,
|
vim.keymap.set('n', '<space>v', vim.diagnostic.open_float,
|
||||||
vim.tbl_extend('error', options, { desc = 'Diagnostics Float' }))
|
vim.tbl_extend('error', options, { desc = 'Diagnostics Float' }))
|
||||||
vim.keymap.set('n', '<space>V', fzf.diagnostics_document, vim.tbl_extend('error', options, { desc = 'Diagnostics' }))
|
|
||||||
vim.keymap.set('n', '<A-o>', '<cmd>ClangdSwitchSourceHeader<CR>',
|
vim.keymap.set('n', '<A-o>', '<cmd>ClangdSwitchSourceHeader<CR>',
|
||||||
vim.tbl_extend('error', options, { desc = 'Switch Source/Header' }))
|
vim.tbl_extend('error', options, { desc = 'Switch Source/Header' }))
|
||||||
|
|
||||||
|
@ -35,44 +35,75 @@ return {
|
|||||||
{ section = 'startup' },
|
{ section = 'startup' },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
picker = {
|
||||||
|
matcher = {
|
||||||
|
frecency = true
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
keys = {
|
keys = {
|
||||||
{
|
{ '<space>g', function() Snacks.lazygit() end, desc = 'Lazygit', },
|
||||||
'<space>g',
|
{ '<space>gf', function() Snacks.lazygit.log_file() end, desc = 'Lazygit Current File History', },
|
||||||
function()
|
{ '<space>gl', function() Snacks.lazygit.log() end, desc = 'Lazygit Log (cwd)', },
|
||||||
Snacks.lazygit()
|
{ 'm', function() Snacks.words.jump(vim.v.count1) end, desc = 'Next Reference', mode = { 'n' }, },
|
||||||
end,
|
{ '<S-m>', function() Snacks.words.jump(-vim.v.count1) end, desc = 'Prev Reference', mode = { 'n' }, },
|
||||||
desc = 'Lazygit',
|
-- Top Pickers & Explorer
|
||||||
},
|
{ '<leader><space>', function() Snacks.picker.smart() end, desc = 'Smart Find Files' },
|
||||||
{
|
{ '<leader>b', function() Snacks.picker.buffers() end, desc = 'Buffers' },
|
||||||
'<space>gf',
|
{ '<leader>l', function() Snacks.picker.grep() end, desc = 'Grep' },
|
||||||
function()
|
{ '<leader>:', function() Snacks.picker.command_history() end, desc = 'Command History' },
|
||||||
Snacks.lazygit.log_file()
|
{ '<leader>n', function() Snacks.picker.notifications() end, desc = 'Notification History' },
|
||||||
end,
|
{ '<leader>e', function() Snacks.explorer() end, desc = 'File Explorer' },
|
||||||
desc = 'Lazygit Current File History',
|
-- find
|
||||||
},
|
-- { "<leader>fb", function() Snacks.picker.buffers() end, desc = "Buffers" },
|
||||||
{
|
-- { "<leader>f", function() Snacks.picker.files({ cwd = vim.fn.stdpath("config") }) end, desc = "Find Config File" },
|
||||||
'<space>gl',
|
{ '<leader>f', function() Snacks.picker.files() end, desc = 'Find Files' },
|
||||||
function()
|
{ '<leader>g', function() Snacks.picker.git_files() end, desc = 'Find Git Files' },
|
||||||
Snacks.lazygit.log()
|
{ '<space>p', function() Snacks.picker.projects() end, desc = 'Projects' },
|
||||||
end,
|
{ '<leader>o', function() Snacks.picker.recent() end, desc = 'Recent' },
|
||||||
desc = 'Lazygit Log (cwd)',
|
{ '<leader>i', function() Snacks.picker.recent({ filter = { cwd = true } }) end, desc = 'Recent in cwd' },
|
||||||
},
|
-- git
|
||||||
{
|
-- { "<leader>gb", function() Snacks.picker.git_branches() end, desc = "Git Branches" },
|
||||||
'm',
|
-- { "<leader>gl", function() Snacks.picker.git_log() end, desc = "Git Log" },
|
||||||
function()
|
-- { "<leader>gL", function() Snacks.picker.git_log_line() end, desc = "Git Log Line" },
|
||||||
Snacks.words.jump(vim.v.count1)
|
-- { "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
|
||||||
end,
|
-- { "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },
|
||||||
desc = 'Next Reference',
|
-- { "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (Hunks)" },
|
||||||
mode = { 'n' },
|
-- { "<leader>gf", function() Snacks.picker.git_log_file() end, desc = "Git Log File" },
|
||||||
},
|
-- Grep
|
||||||
{
|
{ '<leader>sb', function() Snacks.picker.lines() end, desc = 'Buffer Lines' },
|
||||||
'<S-m>',
|
{ '<leader>sB', function() Snacks.picker.grep_buffers() end, desc = 'Grep Open Buffers' },
|
||||||
function()
|
-- { "<leader>sg", function() Snacks.picker.grep() end, desc = "Grep" },
|
||||||
Snacks.words.jump(-vim.v.count1)
|
{ '<leader>d', function() Snacks.picker.grep_word() end, desc = 'Visual selection or word', mode = { 'n', 'x' } },
|
||||||
end,
|
-- search
|
||||||
desc = 'Prev Reference',
|
-- { '<leader>s"', function() Snacks.picker.registers() end, desc = "Registers" },
|
||||||
mode = { 'n' },
|
-- { '<leader>s/', function() Snacks.picker.search_history() end, desc = "Search History" },
|
||||||
},
|
-- { "<leader>sa", function() Snacks.picker.autocmds() end, desc = "Autocmds" },
|
||||||
|
-- { "<leader>sb", function() Snacks.picker.lines() end, desc = "Buffer Lines" },
|
||||||
|
-- { "<leader>sc", function() Snacks.picker.command_history() end, desc = "Command History" },
|
||||||
|
-- { "<leader>sC", function() Snacks.picker.commands() end, desc = "Commands" },
|
||||||
|
-- { "<leader>v", function() Snacks.picker.diagnostics() end, desc = "Diagnostics" },
|
||||||
|
{ '<space>V', function() Snacks.picker.diagnostics_buffer() end, desc = 'Buffer Diagnostics' },
|
||||||
|
{ '<leader>sh', function() Snacks.picker.help() end, desc = 'Help Pages' },
|
||||||
|
{ '<leader>sH', function() Snacks.picker.highlights() end, desc = 'Highlights' },
|
||||||
|
{ '<leader>si', function() Snacks.picker.icons() end, desc = 'Icons' },
|
||||||
|
{ '<leader>j', function() Snacks.picker.jumps() end, desc = 'Jumps' },
|
||||||
|
-- { "<leader>sk", function() Snacks.picker.keymaps() end, desc = "Keymaps" },
|
||||||
|
-- { "<leader>sl", function() Snacks.picker.loclist() end, desc = "Location List" },
|
||||||
|
-- { "<leader>sm", function() Snacks.picker.marks() end, desc = "Marks" },
|
||||||
|
-- { "<leader>sM", function() Snacks.picker.man() end, desc = "Man Pages" },
|
||||||
|
-- { "<leader>sp", function() Snacks.picker.lazy() end, desc = "Search for Plugin Spec" },
|
||||||
|
-- { "<leader>sq", function() Snacks.picker.qflist() end, desc = "Quickfix List" },
|
||||||
|
-- { "<leader>sR", function() Snacks.picker.resume() end, desc = "Resume" },
|
||||||
|
-- { "<leader>su", function() Snacks.picker.undo() end, desc = "Undo History" },
|
||||||
|
-- { "<leader>uC", function() Snacks.picker.colorschemes() end, desc = "Colorschemes" },
|
||||||
|
-- LSP
|
||||||
|
{ '<space>d', function() Snacks.picker.lsp_definitions() end, desc = 'Goto Definition' },
|
||||||
|
{ '<space>D', function() Snacks.picker.lsp_declarations() end, desc = 'Goto Declaration' },
|
||||||
|
{ '<space>r', function() Snacks.picker.lsp_references() end, nowait = true, desc = 'References' },
|
||||||
|
{ '<space>I', function() Snacks.picker.lsp_implementations() end, desc = 'Goto Implementation' },
|
||||||
|
{ '<space>e', function() Snacks.picker.lsp_type_definitions() end, desc = 'Goto T[y]pe Definition' },
|
||||||
|
{ '<A-m>', function() Snacks.picker.lsp_symbols() end, desc = 'LSP Symbols' },
|
||||||
|
{ '<leader>sS', function() Snacks.picker.lsp_workspace_symbols() end, desc = 'LSP Workspace Symbols' },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -13,11 +13,6 @@ return {
|
|||||||
'<cmd>Trouble diagnostics toggle filter.buf=0<cr>',
|
'<cmd>Trouble diagnostics toggle filter.buf=0<cr>',
|
||||||
desc = 'Buffer Diagnostics (Trouble)',
|
desc = 'Buffer Diagnostics (Trouble)',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
'<leader>s',
|
|
||||||
'<cmd>Trouble symbols focus<cr>',
|
|
||||||
desc = 'Symbols (Trouble)',
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
'<leader>cl',
|
'<leader>cl',
|
||||||
'<cmd>Trouble lsp toggle focus=false win.position=right<cr>',
|
'<cmd>Trouble lsp toggle focus=false win.position=right<cr>',
|
||||||
|
@ -41,4 +41,5 @@ return {
|
|||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
enabled = false
|
||||||
}
|
}
|
||||||
|
@ -30,10 +30,6 @@ return {
|
|||||||
['LspReferenceRead'] = { bg = colors.vulgaris.green, fg = colors.vulgaris.bg1, fmt = 'nocombine' },
|
['LspReferenceRead'] = { bg = colors.vulgaris.green, fg = colors.vulgaris.bg1, fmt = 'nocombine' },
|
||||||
['LspReferenceWrite'] = { bg = colors.vulgaris.red, fg = colors.vulgaris.bg1, fmt = 'nocombine' },
|
['LspReferenceWrite'] = { bg = colors.vulgaris.red, fg = colors.vulgaris.bg1, fmt = 'nocombine' },
|
||||||
['LspReferenceText'] = { bg = colors.vulgaris.cyan, fg = colors.vulgaris.bg1, fmt = 'nocombine' },
|
['LspReferenceText'] = { bg = colors.vulgaris.cyan, fg = colors.vulgaris.bg1, fmt = 'nocombine' },
|
||||||
['Delimiter'] = { fg = colors.vulgaris.fg },
|
|
||||||
['NormalFloat'] = { bg = colors.vulgaris.bg3 },
|
|
||||||
['FloatNormal'] = { bg = colors.vulgaris.bg3 },
|
|
||||||
['PmenuSel'] = { bg = colors.vulgaris.grey },
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
require('bamboo').load()
|
require('bamboo').load()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user