diff --git a/lazy-lock.json b/lazy-lock.json index 4244bed..7f7f97b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -33,6 +33,7 @@ "rainbow_csv.nvim": { "branch": "main", "commit": "a520dabf1c74d7d7d8341dd3f3570063ef51b3aa" }, "range-highlight.nvim": { "branch": "master", "commit": "8b5e8ccb3460b2c3675f4639b9f54e64eaab36d9" }, "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "master", "commit": "6213322ab56eb27356fdc09a5078e41e3ea7f3bc" }, "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "41d8b52183df39096d5a2918467cd6266282f64b" }, "vim-matchup": { "branch": "master", "commit": "269f9bea87e20a01438085eb13df539929a12727" }, diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index 6259325..22fd378 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -144,22 +144,37 @@ local plugins = { "andymass/vim-matchup", event = "BufEnter" }, + { + 'nvim-telescope/telescope-fzf-native.nvim', + build = 'make', + lazy = true + }, { "nvim-telescope/telescope.nvim", - dependencies = { 'nvim-lua/plenary.nvim' }, + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-telescope/telescope-fzf-native.nvim' + }, event = "CmdlineEnter", keys = { - vim.keymap.set('', 't/', ':Telescope lsp_dynamic_workspace_symbols'), - vim.keymap.set('', 'tg', ':Telescope live_grep'), - vim.keymap.set('', 'tb', ':Telescope buffers'), - vim.keymap.set('', 'tf', ':Telescope fd'), - }, - opts = { - defaults = { - layout_strategy = 'flex', - layout_config = { flex = { flip_columns = 144 } }, - }, + vim.keymap.set('n', 'f/', ':Telescope lsp_dynamic_workspace_symbols'), + vim.keymap.set('n', 'fg', ':Telescope live_grep'), + vim.keymap.set('n', 'fb', ':Telescope buffers'), + vim.keymap.set('n', 'ff', ':Telescope find_files'), + vim.keymap.set('n', 'fd', ':Telescope diagnostics'), + vim.keymap.set('n', 'fs', ':Telescope spell_suggest'), }, + config = function() + require("telescope").setup { + defaults = { + layout_strategy = 'flex', + layout_config = { + flex = { flip_columns = 144 } + }, + }, + } + require('telescope').load_extension('fzf') + end }, { 'kevinhwang91/nvim-bqf', diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 3845183..472a43e 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -10,28 +10,30 @@ vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('UserLspConfig', {}), callback = function(ev) -- Enable completion triggered by - vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc' + -- vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc' -- Buffer local mappings. -- See `:help vim.lsp.*` for documentation on any of the below functions local opts = { buffer = ev.buf } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) - vim.keymap.set({ 'n', 'i' }, '', vim.lsp.buf.signature_help, opts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, opts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, opts) vim.keymap.set('n', 'wl', function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, opts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, opts) - vim.keymap.set({ 'n', 'v' }, 'ca', vim.lsp.buf.code_action, opts) vim.keymap.set('n', 'fm', function() vim.lsp.buf.format { async = true } end, opts) - vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, opts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) + vim.keymap.set('n', 'ci', vim.lsp.buf.incoming_calls, opts) + vim.keymap.set('n', 'co', vim.lsp.buf.outgoing_calls, opts) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, opts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, opts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, opts) + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts) + vim.keymap.set({ 'n', 'i' }, '', vim.lsp.buf.signature_help, opts) + vim.keymap.set({ 'n', 'v' }, 'ca', vim.lsp.buf.code_action, opts) end, })