Replaced telescope and trouble with snacks picker

7 files changed, 132 insertions, 113 deletions

diff --git a/.config/nvim/lua/dap-keymaps.lua b/.config/nvim/lua/dap-keymaps.lua
index 8c3d540..dd97f85 100644
--- a/.config/nvim/lua/dap-keymaps.lua
+++ b/.config/nvim/lua/dap-keymaps.lua
@@ -4,7 +4,7 @@ local keymaps = {
     { 'n', '<leader>dt', '<cmd>DapRestartFrame<cr>', { desc = '[D]ebug [R]estart' } },
     { 'n', '<leader>dp', '<cmd>DapToggleBreakpoint<cr>', { desc = '[D]ebug Break[p]oint' } },
     { 'n', '<leader>dh', '<cmd>lua require("dap.ui.widgets").hover()<cr>', { desc = '[D]ebug [H]over' } },
-    { 'n', '<leader>si', '<cmd>DapStepInto<cr>', { desc = '[S]tep [I]nto' } },
+    -- { 'n', '<leader>si', '<cmd>DapStepInto<cr>', { desc = '[S]tep [I]nto' } },
     { 'n', '<leader>so', '<cmd>DapStepOver<cr>', { desc = '[S]tep [O]ver' } },
     { 'n', '<leader>sO', '<cmd>DapStepOut<cr>', { desc = '[S]tep [O]ut' } },
 }
diff --git a/.config/nvim/lua/lsp-keymaps.lua b/.config/nvim/lua/lsp-keymaps.lua
index 7bbc2e8..1721881 100644
--- a/.config/nvim/lua/lsp-keymaps.lua
+++ b/.config/nvim/lua/lsp-keymaps.lua
@@ -18,12 +18,7 @@ end
 
 local keymaps = {
     { 'n', 'gd', '<cmd>Lspsaga goto_definition<cr>', { desc = '[G]oto [D]efinition' } },
-    -- { 'n',          'gu',         '<cmd>Telescope lsp_references<cr>',        { desc = '[G]oto [U]sages' } },
     { 'n', 'gu', '<cmd>Lspsaga finder<cr>', { desc = '[G]oto [U]sages' } },
-    { 'n', 'gi', '<cmd>Telescope lsp_implementations<cr>', { desc = '[G]oto [I]mplementations' } },
-    { 'n', 'gt', '<cmd>Telescope lsp_type_definitions<cr>', { desc = '[G]oto [T]ype Definitions' } },
-    { 'n', '<leader>ds', '<cmd>Telescope lsp_document_symbols<cr>', { desc = '[D]ocument [S]symbols' } },
-    { 'n', '<leader>ps', '<cmd>Telescope lsp_workspace_symbols<cr>', { desc = '[P]roject [S]ymbols' } },
     { { 'n', 'i' }, '<C-p>', vim.lsp.buf.signature_help, { desc = 'Show [P]arameters' } },
     { 'n', 'K', '<cmd>Lspsaga hover_doc<cr>', { desc = 'Documentation' } },
     { 'n', 'R', '<cmd>Lspsaga rename<cr>', { desc = '[R]ename' } },
diff --git a/.config/nvim/lua/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua
index 5e00a23..02c5e35 100644
--- a/.config/nvim/lua/plugins/snacks.lua
+++ b/.config/nvim/lua/plugins/snacks.lua
@@ -23,6 +23,7 @@ return {
                 return true
             end,
         },
+        picker = {},
     },
     keys = {
         {
@@ -45,11 +46,11 @@ return {
         },
 
         {
-            '<leader>si',
+            '<leader>ri',
             function()
                 Snacks.image.hover()
             end,
-            desc = '[S]how [I]mage',
+            desc = '[R]ender [I]mage',
         },
 
         {
@@ -66,5 +67,116 @@ return {
             end,
             desc = '[N]otification [H]istory',
         },
+
+        {
+            '<leader>sp',
+            function()
+                Snacks.picker.pickers({ layout = 'telescope' })
+            end,
+            desc = '[S]how [P]ickers',
+        },
+        {
+            '<leader>fs',
+            function()
+                Snacks.picker.files({
+                    layout = 'telescope',
+                    hidden = true,
+                    follow = true,
+                })
+            end,
+            desc = '[F]ile [S]ystem',
+        },
+        {
+            '<leader>lv',
+            function()
+                Snacks.picker.grep({
+                    layout = 'telescope',
+                    hidden = true,
+                    follow = true,
+                })
+            end,
+            desc = '[L]ive [G]rep',
+        },
+        {
+            'gi',
+            function()
+                Snacks.picker.lsp_implementations()
+            end,
+            { desc = '[G]oto [I]mplementations' },
+        },
+        {
+            'gt',
+            function()
+                Snacks.picker.lsp_type_definitions()
+            end,
+            { desc = '[G]oto [T]ype Definitions' },
+        },
+        {
+            '<leader>ds',
+            function()
+                Snacks.picker.lsp_symbols({ layout = 'telescope' })
+            end,
+            desc = '[D]ocument [S]ymbols',
+        },
+        {
+            '<leader>ps',
+            function()
+                Snacks.picker.lsp_workspace_symbols({ layout = 'telescope' })
+            end,
+            desc = '[P]roject [S]ymbols',
+        },
+        {
+            '<leader>di',
+            function()
+                Snacks.picker.diagnostics({ layout = 'telescope' })
+            end,
+            desc = '[Di]agnostics',
+        },
+        {
+            '<leader>dl',
+            function()
+                Snacks.picker.diagnostics_buffer({ layout = 'telescope' })
+            end,
+            desc = '[D]iagnostics [L]ocal',
+        },
+        {
+            '<leader>fh',
+            function()
+                Snacks.picker.help({ layout = 'telescope' })
+            end,
+            desc = '[F]ind [H]elp',
+        },
+        {
+            '<leader>hi',
+            function()
+                Snacks.picker.highlights({
+                    layout = 'telescope',
+                    hidden = true,
+                    follow = true,
+                })
+            end,
+            desc = '[Hi]light Groups',
+        },
+        {
+            '<leader>si',
+            function()
+                Snacks.picker.icons({ layout = 'select' })
+            end,
+            desc = '[S]earch [I]cons',
+        },
+        {
+            '<leader>sk',
+            function()
+                Snacks.picker.keymaps({ layout = 'dropdown' })
+            end,
+            desc = '[S]earch [K]eymaps',
+        },
+        {
+            '<leader>th',
+            function()
+                Snacks.picker.colorschemes({ layout = 'dropdown' })
+            end,
+            desc = '[T]hemes [P]icker',
+        },
     },
 }
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
deleted file mode 100644
index b3e09af..0000000
--- a/.config/nvim/lua/plugins/telescope.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-return {
-    'nvim-telescope/telescope.nvim',
-    tag = '0.1.5',
-    dependencies = {
-        'nvim-lua/plenary.nvim',
-        { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
-        'nvim-telescope/telescope-ui-select.nvim',
-    },
-    cmd = 'Telescope',
-    config = function()
-        require('telescope_helper')
-    end,
-    keys = {
-        '<leader>fs',
-        '<leader>fa',
-        '<leader>fh',
-        '<leader>fm',
-        '<leader>lv',
-        '<leader>f.',
-        '<leader>th',
-    },
-}
diff --git a/.config/nvim/lua/plugins/todo-comments.lua b/.config/nvim/lua/plugins/todo-comments.lua
index 799afd8..b19ad05 100644
--- a/.config/nvim/lua/plugins/todo-comments.lua
+++ b/.config/nvim/lua/plugins/todo-comments.lua
@@ -13,8 +13,23 @@ return {
     dependencies = { 'nvim-lua/plenary.nvim' },
     event = 'VeryLazy',
     keys = {
-        { '<leader>st', '<cmd>TodoTelescope keywords=TODO,FIX<cr>', desc = '[S]earch [T]odos' },
-        { '<leader>lt', '<cmd>TodoTrouble<cr>', desc = '[L]ist [T]odos' },
+        {
+            '<leader>st',
+            function()
+                Snacks.picker.todo_comments({
+                    layout = 'telescope',
+                    keywords = { 'TODO', 'FIX', 'FIXME', 'BUG', 'ISSUE', 'OPTIMIZE' },
+                })
+            end,
+            desc = '[S]earch [T]odos',
+        },
+        {
+            '<leader>sn',
+            function()
+                Snacks.picker.todo_comments({ layout = 'telescope' })
+            end,
+            desc = '[S]earch [N]otes',
+        },
     },
     config = function()
         require('todo-comments').setup({
diff --git a/.config/nvim/lua/plugins/trouble.lua b/.config/nvim/lua/plugins/trouble.lua
deleted file mode 100644
index 3239aa7..0000000
--- a/.config/nvim/lua/plugins/trouble.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-return {
-    'folke/trouble.nvim',
-    opts = {},
-    cmd = 'Trouble',
-    -- TODO: Consider maybe using this for outlines (code structure)
-    -- and also configuring some of the keys to better fit me
-    -- and probably removing most of them in the process
-    keys = {
-        {
-        '<leader>xx',
-            '<cmd>Trouble diagnostics toggle<cr>',
-            desc = 'Diagnostics (Trouble)',
-        },
-        {
-            '<leader>xX',
-            '<cmd>Trouble diagnostics toggle filter.buf=0<cr>',
-            desc = 'Buffer Diagnostics (Trouble)',
-        },
-        {
-            '<leader>cs',
-            '<cmd>Trouble symbols toggle focus=false<cr>',
-            desc = 'Symbols (Trouble)',
-        },
-        {
-            '<leader>cl',
-            '<cmd>Trouble lsp toggle focus=false win.position=right<cr>',
-            desc = 'LSP Definitions / references / ... (Trouble)',
-        },
-        {
-            '<leader>xL',
-            '<cmd>Trouble loclist toggle<cr>',
-            desc = 'Location List (Trouble)',
-        },
-        {
-            '<leader>xQ',
-            '<cmd>Trouble qflist toggle<cr>',
-            desc = 'Quickfix List (Trouble)',
-        },
-    },
-}
diff --git a/.config/nvim/lua/telescope_helper.lua b/.config/nvim/lua/telescope_helper.lua
deleted file mode 100644
index 5a84121..0000000
--- a/.config/nvim/lua/telescope_helper.lua
+++ /dev/null
@@ -1,41 +0,0 @@
-local telescope = require('telescope')
-telescope.setup({
-    pickers = {
-        find_files = { follow = true, hidden = true },
-        grep_string = { additional_args = '--follow' },
-        live_grep = { additional_args = '--follow' },
-    },
-    extensions = {
-        fzf = {
-            fuzzy = true, -- false will only do exact matching
-            override_generic_sorter = true,
-            override_file_sorter = true,
-            case_mode = 'smart_case', -- default "smart_case" or "ignore_case" or "respect_case"
-        },
-        ['ui-select'] = {
-            require('telescope.themes').get_dropdown({}),
-        },
-    },
-})
-
-pcall(telescope.load_extension('ui-select'))
-pcall(telescope.load_extension('fzf'))
-
-local builtin = require('telescope.builtin')
-local function find_all()
-    builtin.find_files({
-        cwd = '~',
-        hidden = true,
-        no_ignore = true,
-        no_ignore_parent = true,
-    })
-end
-
-vim.keymap.set('n', '<leader>fs', builtin.find_files, { desc = '[F]ile [S]ystem' })
-vim.keymap.set('n', '<leader>fa', find_all, { desc = '[F]ind [A]ll files' })
-vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = '[F]ind [H]elp' })
-vim.keymap.set('n', '<leader>fm', builtin.man_pages, { desc = '[F]ind [M]an Pages' })
-vim.keymap.set('n', '<leader>lv', builtin.live_grep, { desc = '[L]ive [G]rep' })
-vim.keymap.set('n', '<leader>f.', builtin.oldfiles, { desc = '[F]ind Recent Files' })
-vim.keymap.set('n', '<leader>th', builtin.colorscheme, { desc = 'List [Th]eme' })
-vim.keymap.set('n', '<leader>hi', builtin.highlights, { desc = '[Hi]light Groups' })