From ccd57f9718f47eda2089e77df41dcbf421d86d86 Mon Sep 17 00:00:00 2001 From: Lee Tang Date: Thu, 11 May 2023 12:42:48 +0800 Subject: [PATCH] fix ripgrep drain out memory Signed-off-by: Lee Tang --- nvim/lua/config/nvim_telescope.lua | 16 +++++++++++----- nvim/lua/plugins.lua | 5 +++++ nvim/lua/utils.lua | 6 +++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/nvim/lua/config/nvim_telescope.lua b/nvim/lua/config/nvim_telescope.lua index b7cce0f..43c04ce 100644 --- a/nvim/lua/config/nvim_telescope.lua +++ b/nvim/lua/config/nvim_telescope.lua @@ -24,8 +24,14 @@ require('telescope').setup({ }, }) -map('n', 'ff', 'Telescope find_files') -map('n', 'fg', 'Telescope live_grep') -map('n', 'fb', 'Telescope buffers') -map('n', 'fh', 'Telescope help_tags') -map('n', ';', 'Telescope commands') +local builtin = require('telescope.builtin') +map('n', 'ff', builtin.find_files) +-- map('n', 'fg', [[:lua require('telescope.builtin').live_grep({additional_args = {'-j8'}})]]) +map('n', 'fb', builtin.buffers) +map('n', 'fg', function() builtin.live_grep({ additional_args = { '-j8' } }) end) +map('n', 'fh', builtin.help_tags) +map('n', ';', builtin.commands) + +-- To get fzf loaded and working with telescope, you need to call +-- load_extension, somewhere after setup function: +require('telescope').load_extension('fzf') diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 361107e..c6188bd 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -96,6 +96,11 @@ return require('packer').startup(function(use) config = function() require('config.nvim_telescope') end, + requires = { + { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', config = function() + require('telescope').load_extension('fzf') + end } + }, }) use({ 'hrsh7th/nvim-cmp', diff --git a/nvim/lua/utils.lua b/nvim/lua/utils.lua index 9e48683..505b81b 100644 --- a/nvim/lua/utils.lua +++ b/nvim/lua/utils.lua @@ -34,7 +34,11 @@ local function map(modes, lhs, rhs, opts) modes = { modes } end for _, mode in ipairs(modes) do - map_key(mode, lhs, rhs, opts) + if type(rhs) == "string" then + map_key(mode, lhs, rhs, opts) + else + vim.keymap.set(mode, lhs, rhs, opts) + end end end