From 1af6b05eab1ba06235e413df62728182113d8eef Mon Sep 17 00:00:00 2001 From: triethyl Date: Sun, 2 Nov 2025 13:52:54 -0500 Subject: neovim: replaced mini.pick with fzf-lua --- pkgs/custom-neovim/config/lua/keymaps.lua | 56 ++++++++++++++-------- pkgs/custom-neovim/config/lua/lsp.lua | 10 ++-- pkgs/custom-neovim/config/lua/plugins/fzf.lua | 9 ++++ .../custom-neovim/config/lua/plugins/mini-pick.lua | 25 ---------- 4 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 pkgs/custom-neovim/config/lua/plugins/fzf.lua delete mode 100644 pkgs/custom-neovim/config/lua/plugins/mini-pick.lua (limited to 'pkgs/custom-neovim') diff --git a/pkgs/custom-neovim/config/lua/keymaps.lua b/pkgs/custom-neovim/config/lua/keymaps.lua index 2b2b70e..86632ee 100644 --- a/pkgs/custom-neovim/config/lua/keymaps.lua +++ b/pkgs/custom-neovim/config/lua/keymaps.lua @@ -12,11 +12,11 @@ end vim.g.mapleader = " " -- Pickers -mapkey("n", "f", "Open file picker", ":Pick files", "mini.pick") -mapkey("n", "o", "Open old file picker", ":Pick oldfiles", "mini.pick") -mapkey("n", "/", "Open live grep picker", ":Pick grep_live", "mini.pick") -mapkey("n", "k", "Open colorscheme picker", ":Pick colorschemes", "mini.pick") -mapkey("n", "z", "Open zoxide picker", ":Zi", "zoxide.vim") +mapkey("n", "f", "Open file picker", ":FzfLua files", "fzf-lua") +mapkey("n", "o", "Open old file picker", ":FzfLua oldfiles", "fzf-lua") +mapkey("n", "/", "Open live grep picker", ":FzfLua live_grep", "fzf-lua") +mapkey("n", "k", "Open colorscheme picker", ":FzfLua colorschemes", "fzf-lua") +mapkey("n", "z", "Open zoxide picker", ":FzfLua zoxide", "fzf-lua") mapkey("n", "l", "Open tab directory picker", function () local dirstr = vim.fn.system("fd -t d") @@ -33,7 +33,7 @@ mapkey("n", "l", "Open tab directory picker", function () vim.cmd.tcd(choice) end ) -end, "mini.pick") +end, "fzf-lua") mapkey("n", "L", "Open directory picker", function () local dirstr = vim.fn.system("fd -t d") @@ -50,19 +50,21 @@ mapkey("n", "L", "Open directory picker", function () vim.cmd.cd(choice) end ) -end, "mini.pick") +end, "fzf-lua") -- File manager mapkey("n", "e", "Open file manager", ":lua MiniFiles.open()", "mini.files") -- Git mapkey("n", "g", "Manage git", "") -mapkey("n", "gg", "Open neogit", ":Neogit", "neogit") mapkey("n", "ga", "Git add", ":Git add %:p", "mini-git") mapkey("n", "gA", "Git add cwd", function() vim.cmd("Git add " .. vim.fn.getcwd() .. "/.") end, "mini-git") mapkey("n", "gr", "Git remove", ":Git rm %:p", "mini-git") mapkey("n", "gc", "Git commit", ":Git commit", "mini-git") -mapkey("n", "gs", "Git status", ":Git status", "mini-git") +mapkey("n", "gc", "Browse git commits", ":FzfLua git_commits", "fzf-lua") +mapkey("n", "gb", "Browse git branches", ":FzfLua git_branches", "fzf-lua") +mapkey("n", "gB", "Browse git blame", ":FzfLua git_blame", "fzf-lua") +mapkey("n", "gg", "Git status", ":FzfLua git_status", "fzf-lua") mapkey("n", "gp", "Git pull", ":Git pull", "mini-git") mapkey("n", "gP", "Git push", ":Git push", "mini-git") @@ -72,10 +74,11 @@ mapkey("n", "tt", "Go to next tab", ":tabn") mapkey("n", "tT", "Go to previous tab", ":tabp") mapkey("n", "to", "Open new tab", ":tabnew") mapkey("n", "tc", "Close current tab", ":tabclose") +mapkey("n", "tp", "Pick tabs", ":FzfLua tabs", "fzf-lua") -- Buffers mapkey("n", "b", "Manage buffers", "") -mapkey("n", "bb", "Open buffer picker", ":Pick buffers", "mini.pick") +mapkey("n", "bb", "Open buffer picker", ":FzfLua buffers", "fzf-lua") mapkey("n", "bc", "Clear invisible buffers", function () local bufinfos = vim.fn.getbufinfo({buflisted = 1}) vim.tbl_map(function (bufinfo) @@ -91,13 +94,29 @@ mapkey("n", "j", "Manage comment graphics", "") mapkey("n", "jb", "Create comment box", ":CB") -- Session -mapkey("n", "w", "Manage sessions", "") -mapkey("n", "ww", "Open a session", ":AutoSession search", "mini.pick") -mapkey("n", "wd", "Delete a session", ":AutoSession deletePicker", "mini.pick") -mapkey("n", "wD", "Delete current session", ":AutoSession delete", "mini.pick") -mapkey("n", "wr", "Restore last session", ":AutoSession restore") -mapkey("n", "wp", "Purge orphaned sessions", ":AutoSession purgeOrphaned") -mapkey("n", "ws", "Save session", ":AutoSession save") +-- mapkey("n", "w", "Manage sessions", "") +-- mapkey("n", "ww", "Open a session", ":AutoSession search", "mini.pick") +-- mapkey("n", "wd", "Delete a session", ":AutoSession deletePicker", "mini.pick") +-- mapkey("n", "wD", "Delete current session", ":AutoSession delete", "mini.pick") +-- mapkey("n", "wr", "Restore last session", ":AutoSession restore") +-- mapkey("n", "wp", "Purge orphaned sessions", ":AutoSession purgeOrphaned") +-- mapkey("n", "ws", "Save session", ":AutoSession save") + +mapkey("n", "w", "Manage sessions", "", "mini.sessions") +mapkey("n", "ww", "Open a session", ":lua MiniSessions.select('read')", "fzf-lua") +mapkey("n", "wd", "Delete a session", ":lua MiniSessions.select('delete')", "fzf-lua") +mapkey("n", "ws", "Save current session", ":lua MiniSessions.write()") +mapkey("n", "wS", "Save as new session", function() + local session_name = vim.fn.input("Session name: ") + vim.cmd.lua("MiniSessions.write("..session_name..")") +end) +mapkey("n", "wn", "Create new session", function() + vim.cmd.wa() + vim.cmd.lua("MiniSessions.write()") + vim.cmd.new() + vim.cmd([[.+,$bwipeout]]) + vim.cmd.cd("~") +end) -- Terminal mapkey("n", "n", "Open terminal", ":botright terminal") @@ -126,9 +145,6 @@ mapkey({ "n", "v" }, "k", "Go up visually", "gk") mapkey({ "n", "v" }, "", "Go down visually", "g") mapkey({ "n", "v" }, "", "Go up visually", "g") --- Falling key -mapkey("n", "u", "Make it rain", ":CellularAutomaton make_it_rain", "cellular-automaton.nvim") - -- QOL Keys mapkey("t", "", "Exit terminal insert mode", "") vim.keymap.set("c", "", function() diff --git a/pkgs/custom-neovim/config/lua/lsp.lua b/pkgs/custom-neovim/config/lua/lsp.lua index 64496f6..9269713 100644 --- a/pkgs/custom-neovim/config/lua/lsp.lua +++ b/pkgs/custom-neovim/config/lua/lsp.lua @@ -71,11 +71,11 @@ vim.api.nvim_create_autocmd('LspAttach', { end -- LSP Pickers - mapkey('n', "a", "Perform code action", ":lua require('actions-preview').code_actions()", "actions-preview.nvim") - mapkey("n", "S", "Open workspace symbol picker", [[:Pick lsp scope="workspace_symbol"]], "mini.pick") - mapkey("n", "s", "Open symbol picker", [[:Pick lsp scope="document_symbol"]], "mini.pick") - mapkey("n", "I", "Open workspace diagnostic picker", [[:Pick diagnostic scope="all"]], "mini.pick") - mapkey("n", "i", "Open diagnostic picker", [[:Pick diagnostic scope="current"]], "mini.pick") + mapkey('n', "a", "Perform code action", ":FzfLua lsp_code_actions", "fzf-lua") + mapkey("n", "S", "Open workspace symbol picker", ":FzfLua lsp_workspace_symbols", "fzf-lua") + mapkey("n", "s", "Open symbol picker", ":FzfLua lsp_document_symbols", "fzf-lua") + mapkey("n", "I", "Open workspace diagnostic picker", ":FzfLua lsp_workspace_diagnostics", "fzf-lua") + mapkey("n", "i", "Open diagnostic picker", ":FzfLua lsp_document_diagnostics", "fzf-lua") -- Goto Keys mapkey('n', 'gD', "Go to declaration", vim.lsp.buf.declaration) diff --git a/pkgs/custom-neovim/config/lua/plugins/fzf.lua b/pkgs/custom-neovim/config/lua/plugins/fzf.lua new file mode 100644 index 0000000..8af7284 --- /dev/null +++ b/pkgs/custom-neovim/config/lua/plugins/fzf.lua @@ -0,0 +1,9 @@ +return { + "fzf-lua", + cmd = "FzfLua", + after = function () + require("fzf-lua").setup {} + + require("fzf-lua").register_ui_select() + end, +} diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua b/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua deleted file mode 100644 index 68e57ec..0000000 --- a/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua +++ /dev/null @@ -1,25 +0,0 @@ -return { - "mini.pick", - lazy = true, - cmd = "Pick", - after = function() - local win_config = function() - local height = math.floor(0.618 * vim.o.lines) - local width = math.floor(0.618 * vim.o.columns) - return { - anchor = 'NW', height = height, width = width, - row = math.floor(0.5 * (vim.o.lines - height)), - col = math.floor(0.5 * (vim.o.columns - width)), - } - end - require("mini.pick").setup { - window = { - config = win_config, - }, - } - vim.cmd.packadd("mini.extra") - require("mini.extra").setup() - - vim.ui.select = MiniPick.ui_select - end -} -- cgit v1.2.3