From 963cc8bb6aff754419b69ad2e36fddef066794eb Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Tue, 13 Jun 2023 17:03:16 -0700 Subject: [PATCH] Use my keymap functions instead of whichkey for telescope --- neovim/lua/plugins/telescope.lua | 77 +++++++++++++------------------- 1 file changed, 31 insertions(+), 46 deletions(-) diff --git a/neovim/lua/plugins/telescope.lua b/neovim/lua/plugins/telescope.lua index ce9d011..ac249ea 100644 --- a/neovim/lua/plugins/telescope.lua +++ b/neovim/lua/plugins/telescope.lua @@ -20,53 +20,38 @@ local function config_telescope() layout_strategy = "flex", }, }) - local utils = require("utils") - utils.try_require("which-key", function(wk) - wk.register({ - [""] = { "lua require('telescope.builtin').find_files()", "Find files" }, - }) - wk.register({ - b = { "lua require('telescope.builtin').buffers()", "Find buffers" }, - t = { "lua require('telescope.builtin').current_buffer_tags()", "Find buffer tags" }, - ["*"] = { "lua require('telescope.builtin').grep_string()", "Find buffers" }, - f = { - b = { "lua require('telescope.builtin').buffers()", "Find buffers" }, - f = { "lua require('telescope.builtin').find_files()", "Find file" }, - g = { "lua require('telescope.builtin').live_grep()", "Live grep" }, - h = { "lua require('telescope.builtin').help_tags()", "Find help tags" }, - l = { "lua require('telescope.builtin').resume()", "Resume finding" }, - t = { "lua require('telescope.builtin').current_buffer_tags()", "Find buffer tags" }, - T = { "lua require('telescope.builtin').tags()", "Find tags" }, - }, - }, { - prefix = "", - }) - end, function() - local opts = { silent = true, noremap = true } - vim.api.nvim_set_keymap("n", "", "lua require('telescope.builtin').find_files()", opts) - vim.api.nvim_set_keymap("n", "ff", "lua require('telescope.builtin').find_files()", opts) - vim.api.nvim_set_keymap("n", "fl", "lua require('telescope.builtin').resume()", opts) - vim.api.nvim_set_keymap("n", "fh", "lua require('telescope.builtin').help_tags()", opts) - vim.api.nvim_set_keymap("n", "b", "lua require('telescope.builtin').buffers()", opts) - vim.api.nvim_set_keymap("n", "fb", "lua require('telescope.builtin').buffers()", opts) - vim.api.nvim_set_keymap( - "n", - "t", - "lua require('telescope.builtin').current_buffer_tags()", - opts - ) - vim.api.nvim_set_keymap("n", "ft", "lua require('telescope.builtin').tags()", opts) - vim.api.nvim_set_keymap("n", "fg", "lua require('telescope.builtin').live_grep()", opts) - vim.api.nvim_set_keymap("n", "*", "lua require('telescope.builtin').grep_string()", opts) - -- Better spelling replacement for word under cursor - vim.api.nvim_set_keymap( - "n", - "s", - "lua require('telescope.builtin').spell_suggest(require('telescope.themes').get_cursor())", - opts - ) - end) + local utils = require("utils") + utils.keymap_set("n", "", "lua require('telescope.builtin').find_files()", { desc = "Find files" }) + utils.keymap_set("n", "b", "lua require('telescope.builtin').buffers()", { desc = "Find buffers" }) + utils.keymap_set( + "n", + "t", + "lua require('telescope.builtin').current_buffer_tags()", + { desc = "Find buffer tags" } + ) + utils.keymap_set( + "n", + "*", + "lua require('telescope.builtin').grep_string()", + { desc = "Find string under cursor" } + ) + -- Better spelling replacement for word under cursor + utils.keymap_set( + "n", + "s", + "lua require('telescope.builtin').spell_suggest(require('telescope.themes').get_cursor())", + { desc = "Spell check" } + ) + + local finder_keymap = utils.curry_keymap("n", "f") + finder_keymap("b", "lua require('telescope.builtin').buffers()", { desc = "Find buffers" }) + finder_keymap("f", "lua require('telescope.builtin').find_files()", { desc = "Find file" }) + finder_keymap("g", "lua require('telescope.builtin').live_grep()", { desc = "Live grep" }) + finder_keymap("h", "lua require('telescope.builtin').help_tags()", { desc = "Find help tags" }) + finder_keymap("l", "lua require('telescope.builtin').resume()", { desc = "Resume finding" }) + finder_keymap("t", "lua require('telescope.builtin').current_buffer_tags()", { desc = "Find buffer tags" }) + finder_keymap("T", "lua require('telescope.builtin').tags()", { desc = "Find tags" }) load_extensions() end