diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua --- a/lua/plugins/avante.lua +++ b/lua/plugins/avante.lua @@ -1,14 +1,14 @@ --- Import the model fetcher utility -local model_fetcher = require 'model_fetcher' - --- @type LazySpec return { 'yetone/avante.nvim', + enabled = false, event = 'VeryLazy', version = false, -- Never set to "*" -- Build function build = vim.fn.has 'win32' == 1 and 'powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false' or 'make', config = function() + local model_fetcher = require 'model_fetcher' + ---@module 'avante' ---@type avante.Config local opt = { diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -45,7 +45,7 @@ --- @type LazySpec | LazySpec[] return { -- Fuzzy Finder (files, lsp, etc) 'nvim-telescope/telescope.nvim', - event = 'VimEnter', + cmd = 'Telescope', branch = 'master', dependencies = { { 'nvim-treesitter/nvim-treesitter' }, @@ -90,22 +90,17 @@ vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) vim.keymap.set('n', '', code_files_picker, { desc = '[ ] Find code' }) - -- https://github.com/nvim-telescope/telescope.nvim/blob/master/lua/telescope/builtin/__files.lua#L297 vim.keymap.set('n', 'sF', function() builtin.find_files { no_ignore = true } end, { desc = '[S]earch [F]iles, including hidden' }) - -- Slightly advanced example of overriding default behavior and theme vim.keymap.set('n', '/', function() - -- You can pass additional configuration to Telescope to change the theme, layout, etc. builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { winblend = 10, previewer = false, }) end, { desc = '[/] Fuzzily search in current buffer' }) - -- It's also possible to pass additional configuration options. - -- See `:help telescope.builtin.live_grep()` for information about particular keys vim.keymap.set('n', 's/', function() builtin.live_grep { grep_open_files = true, @@ -113,14 +108,30 @@ prompt_title = 'Live Grep in Open Files', } end, { desc = '[S]earch [/] in Open Files' }) - -- Shortcut for searching your Neovim configuration files vim.keymap.set('n', 'sn', function() builtin.find_files { cwd = vim.fn.stdpath 'config', } end, { desc = '[S]earch [N]eovim files' }) - -- Shortcut for chezmoi vim.keymap.set('n', 'sc', require('telescope').extensions.chezmoi.find_files, { desc = '[S]earch [C]hezmoi Files' }) end, + keys = { + { 'sh', desc = '[S]earch [H]elp' }, + { 'sk', desc = '[S]earch [K]eymaps' }, + { 'sb', desc = '[S]earch [B]uffers' }, + { 'sf', desc = '[S]earch [F]iles' }, + { 'ss', desc = '[S]earch [S]elect Telescope' }, + { 'sw', desc = '[S]earch current [W]ord' }, + { 'sg', desc = '[S]earch by [G]rep' }, + { 'sd', desc = '[S]earch [D]iagnostics' }, + { 'sr', desc = '[S]earch [R]esume' }, + { 's.', desc = '[S]earch Recent Files ("." for repeat)' }, + { '', desc = '[ ] Find code' }, + { 'sF', desc = '[S]earch [F]iles, including hidden' }, + { '/', desc = '[/] Fuzzily search in current buffer' }, + { 's/', desc = '[S]earch [/] in Open Files' }, + { 'sn', desc = '[S]earch [N]eovim files' }, + { 'sc', desc = '[S]earch [C]hezmoi Files' }, + }, }