neovim: replaced mini.pick with fzf-lua

1 files changed, 36 insertions, 20 deletions

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", "<leader>f", "Open file picker", ":Pick files<cr>", "mini.pick")
-mapkey("n", "<leader>o", "Open old file picker", ":Pick oldfiles<cr>", "mini.pick")
-mapkey("n", "<leader>/", "Open live grep picker", ":Pick grep_live<cr>", "mini.pick")
-mapkey("n", "<leader>k", "Open colorscheme picker", ":Pick colorschemes<cr>", "mini.pick")
-mapkey("n", "<leader>z", "Open zoxide picker", ":Zi<cr>", "zoxide.vim")
+mapkey("n", "<leader>f", "Open file picker", ":FzfLua files<cr>", "fzf-lua")
+mapkey("n", "<leader>o", "Open old file picker", ":FzfLua oldfiles<cr>", "fzf-lua")
+mapkey("n", "<leader>/", "Open live grep picker", ":FzfLua live_grep<cr>", "fzf-lua")
+mapkey("n", "<leader>k", "Open colorscheme picker", ":FzfLua colorschemes<cr>", "fzf-lua")
+mapkey("n", "<leader>z", "Open zoxide picker", ":FzfLua zoxide<cr>", "fzf-lua")
 mapkey("n", "<leader>l", "Open tab directory picker", function ()
   local dirstr = vim.fn.system("fd -t d")
 
@@ -33,7 +33,7 @@ mapkey("n", "<leader>l", "Open tab directory picker", function ()
       vim.cmd.tcd(choice)
     end
   )
-end, "mini.pick")
+end, "fzf-lua")
 mapkey("n", "<leader>L", "Open directory picker", function ()
   local dirstr = vim.fn.system("fd -t d")
 
@@ -50,19 +50,21 @@ mapkey("n", "<leader>L", "Open directory picker", function ()
       vim.cmd.cd(choice)
     end
   )
-end, "mini.pick")
+end, "fzf-lua")
 
 -- File manager
 mapkey("n", "<leader>e", "Open file manager", ":lua MiniFiles.open()<cr>", "mini.files")
 
 -- Git
 mapkey("n", "<leader>g", "Manage git", "")
-mapkey("n", "<leader>gg", "Open neogit", ":Neogit<cr>", "neogit")
 mapkey("n", "<leader>ga", "Git add", ":Git add %:p<cr>", "mini-git")
 mapkey("n", "<leader>gA", "Git add cwd", function() vim.cmd("Git add " .. vim.fn.getcwd() .. "/.") end, "mini-git")
 mapkey("n", "<leader>gr", "Git remove", ":Git rm %:p<cr>", "mini-git")
 mapkey("n", "<leader>gc", "Git commit", ":Git commit<cr>", "mini-git")
-mapkey("n", "<leader>gs", "Git status", ":Git status<cr>", "mini-git")
+mapkey("n", "<leader>gc", "Browse git commits", ":FzfLua git_commits<cr>", "fzf-lua")
+mapkey("n", "<leader>gb", "Browse git branches", ":FzfLua git_branches<cr>", "fzf-lua")
+mapkey("n", "<leader>gB", "Browse git blame", ":FzfLua git_blame<cr>", "fzf-lua")
+mapkey("n", "<leader>gg", "Git status", ":FzfLua git_status<cr>", "fzf-lua")
 mapkey("n", "<leader>gp", "Git pull", ":Git pull<cr>", "mini-git")
 mapkey("n", "<leader>gP", "Git push", ":Git push<cr>", "mini-git")
 
@@ -72,10 +74,11 @@ mapkey("n", "<leader>tt", "Go to next tab", ":tabn<cr>")
 mapkey("n", "<leader>tT", "Go to previous tab", ":tabp<cr>")
 mapkey("n", "<leader>to", "Open new tab", ":tabnew<cr>")
 mapkey("n", "<leader>tc", "Close current tab", ":tabclose<cr>")
+mapkey("n", "<leader>tp", "Pick tabs", ":FzfLua tabs", "fzf-lua")
 
 -- Buffers
 mapkey("n", "<leader>b", "Manage buffers", "")
-mapkey("n", "<leader>bb", "Open buffer picker", ":Pick buffers<cr>", "mini.pick")
+mapkey("n", "<leader>bb", "Open buffer picker", ":FzfLua buffers<cr>", "fzf-lua")
 mapkey("n", "<leader>bc", "Clear invisible buffers", function ()
   local bufinfos = vim.fn.getbufinfo({buflisted = 1})
   vim.tbl_map(function (bufinfo)
@@ -91,13 +94,29 @@ mapkey("n", "<leader>j", "Manage comment graphics", "")
 mapkey("n", "<leader>jb", "Create comment box", ":CB")
 
 -- Session
-mapkey("n", "<leader>w", "Manage sessions", "")
-mapkey("n", "<leader>ww", "Open a session", ":AutoSession search<cr>", "mini.pick")
-mapkey("n", "<leader>wd", "Delete a session", ":AutoSession deletePicker<cr>", "mini.pick")
-mapkey("n", "<leader>wD", "Delete current session", ":AutoSession delete<cr>", "mini.pick")
-mapkey("n", "<leader>wr", "Restore last session", ":AutoSession restore<cr>")
-mapkey("n", "<leader>wp", "Purge orphaned sessions", ":AutoSession purgeOrphaned<cr>")
-mapkey("n", "<leader>ws", "Save session", ":AutoSession save<cr>")
+-- mapkey("n", "<leader>w", "Manage sessions", "")
+-- mapkey("n", "<leader>ww", "Open a session", ":AutoSession search<cr>", "mini.pick")
+-- mapkey("n", "<leader>wd", "Delete a session", ":AutoSession deletePicker<cr>", "mini.pick")
+-- mapkey("n", "<leader>wD", "Delete current session", ":AutoSession delete<cr>", "mini.pick")
+-- mapkey("n", "<leader>wr", "Restore last session", ":AutoSession restore<cr>")
+-- mapkey("n", "<leader>wp", "Purge orphaned sessions", ":AutoSession purgeOrphaned<cr>")
+-- mapkey("n", "<leader>ws", "Save session", ":AutoSession save<cr>")
+
+mapkey("n", "<leader>w", "Manage sessions", "", "mini.sessions")
+mapkey("n", "<leader>ww", "Open a session", ":lua MiniSessions.select('read')<cr>", "fzf-lua")
+mapkey("n", "<leader>wd", "Delete a session", ":lua MiniSessions.select('delete')<cr>", "fzf-lua")
+mapkey("n", "<leader>ws", "Save current session", ":lua MiniSessions.write()<cr>")
+mapkey("n", "<leader>wS", "Save as new session", function()
+  local session_name = vim.fn.input("Session name: ")
+  vim.cmd.lua("MiniSessions.write("..session_name..")")
+end)
+mapkey("n", "<leader>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", "<leader>n", "Open terminal", ":botright terminal<cr>")
@@ -126,9 +145,6 @@ mapkey({ "n", "v" }, "k", "Go up visually", "gk")
 mapkey({ "n", "v" }, "<down>", "Go down visually", "g<down>")
 mapkey({ "n", "v" }, "<up>", "Go up visually", "g<up>")
 
--- Falling key
-mapkey("n", "<leader>u", "Make it rain", ":CellularAutomaton make_it_rain<cr>", "cellular-automaton.nvim")
-
 -- QOL Keys
 mapkey("t", "<Esc><Esc>", "Exit terminal insert mode", "<C-\\><C-n>")
 vim.keymap.set("c", "<cr>", function()