diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index c388a12..8598993 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -69,16 +69,16 @@ return { map('gra', vim.lsp.buf.code_action, '[G]oto Code [A]ction', { 'n', 'x' }) -- Find references for the word under your cursor. - map('grr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') + map('grr', Snacks.picker.lsp_references, '[G]oto [R]eferences') -- Jump to the implementation of the word under your cursor. -- Useful when your language has ways of declaring types without an actual implementation. - map('gri', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') + map('gri', Snacks.picker.lsp_implementations, '[G]oto [I]mplementation') -- Jump to the definition of the word under your cursor. -- This is where a variable was first declared, or where a function is defined, etc. -- To jump back, press . - map('grd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') + map('grd', Snacks.picker.lsp_definitions, '[G]oto [D]efinition') -- WARN: This is not Goto Definition, this is Goto Declaration. -- For example, in C this would take you to the header. @@ -86,16 +86,16 @@ return { -- Fuzzy find all the symbols in your current document. -- Symbols are things like variables, functions, types, etc. - map('gO', require('telescope.builtin').lsp_document_symbols, 'Open Document Symbols') + map('gO', Snacks.picker.lsp_symbols, 'Open Document Symbols') -- Fuzzy find all the symbols in your current workspace. -- Similar to document symbols, except searches over your entire project. - map('gW', require('telescope.builtin').lsp_dynamic_workspace_symbols, 'Open Workspace Symbols') + map('gW', Snacks.picker.lsp_workspace_symbols, 'Open Workspace Symbols') -- Jump to the type of the word under your cursor. -- Useful when you're not sure what type a variable is and you want to see -- the definition of its *type*, not where it was *defined*. - map('grt', require('telescope.builtin').lsp_type_definitions, '[G]oto [T]ype Definition') + map('grt', Snacks.picker.lsp_type_definitions, '[G]oto [T]ype Definition') -- This function resolves a difference between neovim nightly (version 0.11) and stable (version 0.10) ---@param client vim.lsp.Client @@ -218,8 +218,18 @@ return { completion = { callSnippet = 'Replace', }, - -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings - -- diagnostics = { disable = { 'missing-fields' } }, + diagnostics = { + disable = { 'missing-fields' }, + globals = { 'vim', 'Snacks' }, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = vim.api.nvim_get_runtime_file('', true), + checkThirdParty = false, -- Optional: disables annoying prompts + }, + telemetry = { + enable = false, + }, }, }, }, diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua index 5da5e7c..12d1995 100644 --- a/lua/plugins/snacks.lua +++ b/lua/plugins/snacks.lua @@ -12,4 +12,62 @@ return { }, }, }, + keys = { + { '', function() Snacks.picker.smart() end, desc = 'Smart Find Files' }, + { ',', function() Snacks.picker.buffers() end, desc = 'Buffers' }, + { '/', function() Snacks.picker.grep() end, desc = 'Grep' }, + { ':', function() Snacks.picker.command_history() end, desc = 'Command History' }, + { 'n', function() Snacks.picker.notifications() end, desc = 'Notification History' }, + { 'e', function() Snacks.explorer() end, desc = 'File Explorer' }, + -- find + { 'fb', function() Snacks.picker.buffers() end, desc = 'Buffers' }, + { 'fc', function() Snacks.picker.files { cwd = vim.fn.stdpath 'config' } end, desc = 'Find Config File' }, + { 'ff', function() Snacks.picker.files() end, desc = 'Find Files' }, + { 'fg', function() Snacks.picker.git_files() end, desc = 'Find Git Files' }, + { 'fp', function() Snacks.picker.projects() end, desc = 'Projects' }, + { 'fr', function() Snacks.picker.recent() end, desc = 'Recent' }, + -- git + { 'gb', function() Snacks.picker.git_branches() end, desc = 'Git Branches' }, + { 'gl', function() Snacks.picker.git_log() end, desc = 'Git Log' }, + { 'gL', function() Snacks.picker.git_log_line() end, desc = 'Git Log Line' }, + -- { 'gs', function() Snacks.picker.git_status() end, desc = 'Git Status' }, + { 'gS', function() Snacks.picker.git_stash() end, desc = 'Git Stash' }, + { 'gd', function() Snacks.picker.git_diff() end, desc = 'Git Diff (Hunks)' }, + { 'gf', function() Snacks.picker.git_log_file() end, desc = 'Git Log File' }, + -- Grep + { 'sb', function() Snacks.picker.lines() end, desc = 'Buffer Lines' }, + { 'sB', function() Snacks.picker.grep_buffers() end, desc = 'Grep Open Buffers' }, + { 'sg', function() Snacks.picker.grep() end, desc = 'Grep' }, + { 'sw', function() Snacks.picker.grep_word() end, desc = 'Visual selection or word', mode = { 'n', 'x' } }, + -- search + { 's"', function() Snacks.picker.registers() end, desc = 'Registers' }, + { 's/', function() Snacks.picker.search_history() end, desc = 'Search History' }, + { 'sa', function() Snacks.picker.autocmds() end, desc = 'Autocmds' }, + { 'sb', function() Snacks.picker.lines() end, desc = 'Buffer Lines' }, + { 'sc', function() Snacks.picker.command_history() end, desc = 'Command History' }, + { 'sC', function() Snacks.picker.commands() end, desc = 'Commands' }, + { 'sd', function() Snacks.picker.diagnostics() end, desc = 'Diagnostics' }, + { 'sD', function() Snacks.picker.diagnostics_buffer() end, desc = 'Buffer Diagnostics' }, + { 'sh', function() Snacks.picker.help() end, desc = 'Help Pages' }, + { 'sH', function() Snacks.picker.highlights() end, desc = 'Highlights' }, + { 'si', function() Snacks.picker.icons() end, desc = 'Icons' }, + { 'sj', function() Snacks.picker.jumps() end, desc = 'Jumps' }, + { 'sk', function() Snacks.picker.keymaps() end, desc = 'Keymaps' }, + { 'sl', function() Snacks.picker.loclist() end, desc = 'Location List' }, + { 'sm', function() Snacks.picker.marks() end, desc = 'Marks' }, + { 'sM', function() Snacks.picker.man() end, desc = 'Man Pages' }, + { 'sp', function() Snacks.picker.lazy() end, desc = 'Search for Plugin Spec' }, + { 'sq', function() Snacks.picker.qflist() end, desc = 'Quickfix List' }, + { 'sR', function() Snacks.picker.resume() end, desc = 'Resume' }, + { 'su', function() Snacks.picker.undo() end, desc = 'Undo History' }, + { 'uC', function() Snacks.picker.colorschemes() end, desc = 'Colorschemes' }, + -- LSP + { 'gd', function() Snacks.picker.lsp_definitions() end, desc = 'Goto Definition' }, + { 'gD', function() Snacks.picker.lsp_declarations() end, desc = 'Goto Declaration' }, + { 'gr', function() Snacks.picker.lsp_references() end, nowait = true, desc = 'References' }, + { 'gI', function() Snacks.picker.lsp_implementations() end, desc = 'Goto Implementation' }, + { 'gy', function() Snacks.picker.lsp_type_definitions() end, desc = 'Goto T[y]pe Definition' }, + { 'ss', function() Snacks.picker.lsp_symbols() end, desc = 'LSP Symbols' }, + { 'sS', function() Snacks.picker.lsp_workspace_symbols() end, desc = 'LSP Workspace Symbols' }, + }, } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua deleted file mode 100644 index 691b37c..0000000 --- a/lua/plugins/telescope.lua +++ /dev/null @@ -1,104 +0,0 @@ -return { - -- Fuzzy Finder (files, lsp, etc) - 'nvim-telescope/telescope.nvim', - event = 'VimEnter', - dependencies = { - 'nvim-lua/plenary.nvim', - { -- If encountering errors, see telescope-fzf-native README for installation instructions - 'nvim-telescope/telescope-fzf-native.nvim', - - -- `build` is used to run some command when the plugin is installed/updated. - -- This is only run then, not every time Neovim starts up. - build = 'make', - - -- `cond` is a condition used to determine whether this plugin should be - -- installed and loaded. - cond = function() - return vim.fn.executable 'make' == 1 - end, - }, - { 'nvim-telescope/telescope-ui-select.nvim' }, - - -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, - }, - config = function() - -- Telescope is a fuzzy finder that comes with a lot of different things that - -- it can fuzzy find! It's more than just a "file finder", it can search - -- many different aspects of Neovim, your workspace, LSP, and more! - -- - -- The easiest way to use Telescope, is to start by doing something like: - -- :Telescope help_tags - -- - -- After running this command, a window will open up and you're able to - -- type in the prompt window. You'll see a list of `help_tags` options and - -- a corresponding preview of the help. - -- - -- Two important keymaps to use while in Telescope are: - -- - Insert mode: - -- - Normal mode: ? - -- - -- This opens a window that shows you all of the keymaps for the current - -- Telescope picker. This is really useful to discover what Telescope can - -- do as well as how to actually do it! - - -- [[ Configure Telescope ]] - -- See `:help telescope` and `:help telescope.setup()` - require('telescope').setup { - -- You can put your default mappings / updates / etc. in here - -- All the info you're looking for is in `:help telescope.setup()` - -- - -- defaults = { - -- mappings = { - -- i = { [''] = 'to_fuzzy_refine' }, - -- }, - -- }, - -- pickers = {} - extensions = { - ['ui-select'] = { - require('telescope.themes').get_dropdown(), - }, - }, - } - - -- Enable Telescope extensions if they are installed - pcall(require('telescope').load_extension, 'fzf') - pcall(require('telescope').load_extension, 'ui-select') - - -- See `:help telescope.builtin` - local builtin = require 'telescope.builtin' - vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) - vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) - vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) - vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) - vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) - vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) - vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) - 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', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) - - -- 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, - 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' }) - end, -}