From 8b67fce61cec87cefe65b5c482219af75e56868b Mon Sep 17 00:00:00 2001 From: Nikos Papadakis Date: Thu, 15 Jun 2023 22:03:46 +0300 Subject: [PATCH] Revert "Revert "nvim"" This reverts commit 1f46b1d2ed263e768c71dd801348456bb0e6c160. --- nvim/dot-config/nvim/after/plugin/telescope.lua | 14 ++++++-------- nvim/dot-config/nvim/lua/my/keymaps.lua | 9 +++++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/nvim/dot-config/nvim/after/plugin/telescope.lua b/nvim/dot-config/nvim/after/plugin/telescope.lua index d44e76d..8c2faea 100644 --- a/nvim/dot-config/nvim/after/plugin/telescope.lua +++ b/nvim/dot-config/nvim/after/plugin/telescope.lua @@ -4,8 +4,6 @@ if not ok then return end -local nmap = require("my.utils").nmap - telescope.setup { extensions = { fzf = { @@ -49,10 +47,10 @@ local function dotfiles() } end -nmap("", project, "Find project files") -nmap("fn", dotfiles, "Dotfiles") -nmap("", builtin.git_files, "Find git files") -nmap("fg", builtin.live_grep, "Live grep") -nmap("gs", builtin.git_status, "Git status") - telescope.load_extension("fzf") + +require("my.keymaps").telescope_keymaps { + project = project, + dotfiles = dotfiles, + builtin = builtin, +} diff --git a/nvim/dot-config/nvim/lua/my/keymaps.lua b/nvim/dot-config/nvim/lua/my/keymaps.lua index bdebac4..2980a93 100644 --- a/nvim/dot-config/nvim/lua/my/keymaps.lua +++ b/nvim/dot-config/nvim/lua/my/keymaps.lua @@ -75,6 +75,15 @@ local function lsp_keymaps(client, bufnr) end end +local function telescope_keymaps(fns) + nmap("", fns.project, "Find project files") + nmap("fn", fns.dotfiles, "Dotfiles") + nmap("", fns.builtin.git_files, "Find git files") + nmap("fg", fns.builtin.live_grep, "Live grep") + nmap("gs", fns.builtin.git_status, "Git status") +end + return { lsp_keymaps = lsp_keymaps, + telescope_keymaps = telescope_keymaps, }