From d4ecaa56e52e4f40b9ed6bf3f17b48e72c5361fe Mon Sep 17 00:00:00 2001 From: Oliver Ladner Date: Mon, 8 Dec 2025 16:02:33 +0100 Subject: [PATCH] refactor: replace most Telescope pickers with mini.pick --- lua/weeheavy/plugins/mini.lua | 16 +++++++++++++--- lua/weeheavy/remap.lua | 27 +++++++++++++-------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/lua/weeheavy/plugins/mini.lua b/lua/weeheavy/plugins/mini.lua index dffe8c5..3465fbf 100644 --- a/lua/weeheavy/plugins/mini.lua +++ b/lua/weeheavy/plugins/mini.lua @@ -5,8 +5,18 @@ return { config = function() require("mini.icons").setup() -- require("mini.ai").setup({ n_lines = 500 }) - require("mini.trailspace").setup() - require("mini.cursorword").setup() - require("mini.ai").setup() + require("mini.trailspace").setup() -- highlight trailing space + require("mini.cursorword").setup() -- highlight word below cursor + require("mini.ai").setup() -- replace within/outside quotes + require("mini.pick").setup({ + mappings = { + move_down = "", + move_up = "", + choose_in_split = "", + choose_in_vsplit = "", + mark = "", -- as mentally similar to Tree-Sitter select + }, + }) + require("mini.extra").setup() -- oldfiles picker end, } diff --git a/lua/weeheavy/remap.lua b/lua/weeheavy/remap.lua index 4b32547..853936f 100644 --- a/lua/weeheavy/remap.lua +++ b/lua/weeheavy/remap.lua @@ -1,43 +1,42 @@ -- keyboard shortcuts --- -- Leader key. Base for any key combo vim.g.mapleader = ";" vim.keymap.set("n", "e", ":Oil --float", { desc = "Oil" }) +-- Simple buffer navigation +-- vim.keymap.set("n", "b", ":ls:b", { desc = "Buffers" }) + -- List recently opened files -vim.keymap.set("n", "fo", ":Telescope oldfiles", { noremap = true, desc = "File history" }) +vim.keymap.set("n", "fo", ":Pick oldfiles", { noremap = true, desc = "Recent files" }) -- Find files vim.keymap.set( "n", "ff", - ":Telescope find_files hidden=true no_ignore=false", - { noremap = true, desc = "File search" } + -- ":FzfLua files fzf_colors=true no_ignore=true", + ":Pick files", + { noremap = true, desc = "File name search" } ) -- Live find string (using ripgrep) -vim.keymap.set("n", "fg", ":Telescope live_grep", { noremap = true, desc = "String search" }) +vim.keymap.set("n", "fg", ":Pick grep_live", { noremap = true, desc = "Grep string" }) -- Find string under cursor (using ripgrep) vim.keymap.set( "n", "fs", - ":Telescope grep_string", + ":Pick grep pattern=''", { noremap = true, desc = "Search text under cursor in cwd/grep search string" } ) -vim.keymap.set("n", "", ":Telescope buffers", { noremap = true, desc = "Show open buffers" }) -- todo-comments.nvim +-- NOTE: this one is a bit hard to migrate away from Telescope to mini.nvim vim.keymap.set("n", "ft", ":TodoTelescope", { noremap = true, desc = "Find TODOs" }) -vim.keymap.set( - "n", - "gla", - ":Telescope git_commits", - { noremap = true, desc = "Git log (across all files)" } -) -vim.keymap.set("n", "glf", ":Telescope git_bcommits", { noremap = true, desc = "Git log (this file)" }) + +vim.keymap.set("n", "gla", ":Pick git_commits", { noremap = true, desc = "Git log (all files)" }) +vim.keymap.set("n", "glf", ":Pick git_commits path='%'", { noremap = true, desc = "Git log (this file)" }) vim.keymap.set("n", "gd", function() if next(require("diffview.lib").views) == nil then vim.cmd("DiffviewOpen")