switch to snacks picker

2025-02-08 21:30:14 +01:00 · 2025-02-08 21:30:14 +01:00 · 5ec3e6623d
commit 5ec3e6623d
parent fff9f428f9
6 changed files with 70 additions and 57 deletions
--- a/lua/plugins/fzf-lua.lua
+++ b/lua/plugins/fzf-lua.lua
@ -123,4 +123,5 @@ return {
      desc = 'Fuzzy complete path',
    },
  },
+  enabled = false
 }
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@ -1,13 +1,9 @@
 local lspKeys = function(client, bufnr)
-  local fzf = require('fzf-lua')
  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_next, vim.tbl_extend('error', options, { desc = 'Diag next' }))
  vim.keymap.set({ 'n', 'x' }, '<space>a', vim.lsp.buf.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>h', function()
    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.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', '<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.tbl_extend('error', options, { desc = 'Type definition' }))
  vim.keymap.set({ 'n', 'i', 'x' }, '<C-k>', vim.lsp.buf.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.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.tbl_extend('error', options, { desc = 'Switch Source/Header' }))

--- a/lua/plugins/snacks.lua
+++ b/lua/plugins/snacks.lua
@ -35,44 +35,75 @@ return {
        { section = 'startup' },
      },
    },
+    picker = {
+      matcher = {
+        frecency = true
+      }
+    }
  },
  keys = {
-    {
-      '<space>g',
-      function()
-        Snacks.lazygit()
-      end,
-      desc = 'Lazygit',
-    },
-    {
-      '<space>gf',
-      function()
-        Snacks.lazygit.log_file()
-      end,
-      desc = 'Lazygit Current File History',
-    },
-    {
-      '<space>gl',
-      function()
-        Snacks.lazygit.log()
-      end,
-      desc = 'Lazygit Log (cwd)',
-    },
-    {
-      'm',
-      function()
-        Snacks.words.jump(vim.v.count1)
-      end,
-      desc = 'Next Reference',
-      mode = { 'n' },
-    },
-    {
-      '<S-m>',
-      function()
-        Snacks.words.jump(-vim.v.count1)
-      end,
-      desc = 'Prev Reference',
-      mode = { 'n' },
-    },
+    { '<space>g',        function() Snacks.lazygit() end,                              desc = 'Lazygit', },
+    { '<space>gf',       function() Snacks.lazygit.log_file() end,                     desc = 'Lazygit Current File History', },
+    { '<space>gl',       function() Snacks.lazygit.log() end,                          desc = 'Lazygit Log (cwd)', },
+    { 'm',               function() Snacks.words.jump(vim.v.count1) end,               desc = 'Next Reference',               mode = { 'n' }, },
+    { '<S-m>',           function() Snacks.words.jump(-vim.v.count1) end,              desc = 'Prev Reference',               mode = { 'n' }, },
+    -- Top Pickers & Explorer
+    { '<leader><space>', function() Snacks.picker.smart() end,                         desc = 'Smart Find Files' },
+    { '<leader>b',       function() Snacks.picker.buffers() end,                       desc = 'Buffers' },
+    { '<leader>l',       function() Snacks.picker.grep() end,                          desc = 'Grep' },
+    { '<leader>:',       function() Snacks.picker.command_history() end,               desc = 'Command History' },
+    { '<leader>n',       function() Snacks.picker.notifications() end,                 desc = 'Notification History' },
+    { '<leader>e',       function() Snacks.explorer() end,                             desc = 'File Explorer' },
+    -- 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" },
+    { '<leader>f',       function() Snacks.picker.files() end,                         desc = 'Find Files' },
+    { '<leader>g',       function() Snacks.picker.git_files() end,                     desc = 'Find Git Files' },
+    { '<space>p',        function() Snacks.picker.projects() end,                      desc = 'Projects' },
+    { '<leader>o',       function() Snacks.picker.recent() end,                        desc = 'Recent' },
+    { '<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" },
+    -- { "<leader>gl", function() Snacks.picker.git_log() end, desc = "Git Log" },
+    -- { "<leader>gL", function() Snacks.picker.git_log_line() end, desc = "Git Log Line" },
+    -- { "<leader>gs", function() Snacks.picker.git_status() end, desc = "Git Status" },
+    -- { "<leader>gS", function() Snacks.picker.git_stash() end, desc = "Git Stash" },
+    -- { "<leader>gd", function() Snacks.picker.git_diff() end, desc = "Git Diff (Hunks)" },
+    -- { "<leader>gf", function() Snacks.picker.git_log_file() end, desc = "Git Log File" },
+    -- Grep
+    { '<leader>sb',      function() Snacks.picker.lines() end,                         desc = 'Buffer Lines' },
+    { '<leader>sB',      function() Snacks.picker.grep_buffers() end,                  desc = 'Grep Open Buffers' },
+    -- { "<leader>sg", function() Snacks.picker.grep() end, desc = "Grep" },
+    { '<leader>d',       function() Snacks.picker.grep_word() end,                     desc = 'Visual selection or word',     mode = { 'n', 'x' } },
+    -- search
+    -- { '<leader>s"', function() Snacks.picker.registers() end, desc = "Registers" },
+    -- { '<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' },
  },
 }
--- a/lua/plugins/trouble.lua
+++ b/lua/plugins/trouble.lua
@ -13,11 +13,6 @@ return {
      '<cmd>Trouble diagnostics toggle filter.buf=0<cr>',
      desc = 'Buffer Diagnostics (Trouble)',
    },
-    {
-      '<leader>s',
-      '<cmd>Trouble symbols focus<cr>',
-      desc = 'Symbols (Trouble)',
-    },
    {
      '<leader>cl',
      '<cmd>Trouble lsp toggle focus=false win.position=right<cr>',
--- a/lua/plugins/workspaces.lua
+++ b/lua/plugins/workspaces.lua
@ -41,4 +41,5 @@ return {
      end,
    },
  },
+  enabled = false
 }
--- a/lua/themes/bamboo.lua
+++ b/lua/themes/bamboo.lua
@ -30,10 +30,6 @@ return {
        ['LspReferenceRead'] = { bg = colors.vulgaris.green, 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' },
-        ['Delimiter'] = { fg = colors.vulgaris.fg },
-        ['NormalFloat'] = { bg = colors.vulgaris.bg3 },
-        ['FloatNormal'] = { bg = colors.vulgaris.bg3 },
-        ['PmenuSel'] = { bg = colors.vulgaris.grey },
      },
    })
    require('bamboo').load()