neovim: preliminarily replaced fzf-lua with mini.pick

6 files changed, 46 insertions, 36 deletions

diff --git a/pkgs/custom-neovim/.luarc.json b/pkgs/custom-neovim/.luarc.json
index 89999a9..ae02006 100644
--- a/pkgs/custom-neovim/.luarc.json
+++ b/pkgs/custom-neovim/.luarc.json
@@ -15,7 +15,7 @@
     ]
   },
   "diagnostics": {
-    "globals": ["vim"]
+    "globals": ["vim", "MiniFiles", "MiniPick"]
   },
   "telemetry": {
     "enable": false
diff --git a/pkgs/custom-neovim/config/lua/keymaps.lua b/pkgs/custom-neovim/config/lua/keymaps.lua
index 535962d..67d61cf 100644
--- a/pkgs/custom-neovim/config/lua/keymaps.lua
+++ b/pkgs/custom-neovim/config/lua/keymaps.lua
@@ -12,13 +12,14 @@ end
 vim.g.mapleader = " "
 
 -- Pickers
-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 cd picker", ":lua Custom_pickers.fzf_dir_cd()<cr>", "fzf-lua")
-mapkey("n", "<leader>l", "Open tab cd picker", ":lua Custom_pickers.fzf_dir_tcd()<cr>", "fzf-lua")
+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>:", "Open command history picker", ":Pick history<cr>", "mini.pick")
+-- mapkey("n", "<leader>z", "Open zoxide picker", ":FzfLua zoxide<cr>", "fzf-lua")
+-- mapkey("n", "<leader>L", "Open cd picker", ":lua Custom_pickers.fzf_dir_cd()<cr>", "fzf-lua")
+-- mapkey("n", "<leader>l", "Open tab cd picker", ":lua Custom_pickers.fzf_dir_tcd()<cr>", "fzf-lua")
 
 -- File manager
 mapkey("n", "<leader>e", "Open file manager", ":lua MiniFiles.open()<cr>", "mini.files")
@@ -29,10 +30,10 @@ 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>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>gC", "Browse git commits", ":Pick git_commits<cr>", "mini.pick")
+mapkey("n", "<leader>gb", "Browse git branches", ":Pick git_branches<cr>", "mini.pick")
+-- 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")
 
@@ -42,11 +43,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")
+-- mapkey("n", "<leader>tp", "Pick tabs", ":FzfLua tabs", "fzf-lua")
 
 -- Buffers
 mapkey("n", "<leader>b", "Manage buffers", "")
-mapkey("n", "<leader>bb", "Open buffer picker", ":FzfLua buffers<cr>", "fzf-lua")
+mapkey("n", "<leader>bb", "Open buffer picker", ":Pick buffers<cr>", "mini.pick")
 mapkey("n", "<leader>bc", "Clear invisible buffers", function ()
   local bufinfos = vim.fn.getbufinfo({buflisted = 1})
   vim.tbl_map(function (bufinfo)
@@ -63,7 +64,7 @@ mapkey("n", "<leader>jb", "Create comment box", ":CB")
 
 -- Session
 mapkey("n", "<leader>w", "Manage sessions", "")
-mapkey("n", "<leader>ww", "Manage Sessions", ":AutoSession search<cr>", "fzf-lua")
+mapkey("n", "<leader>ww", "Manage Sessions", ":AutoSession search<cr>", "mini.pick")
 mapkey("n", "<leader>ws", "Save current session", ":AutoSession save<cr>")
 mapkey("n", "<leader>wr", "Open last session", ":AutoSession restore<cr>")
 mapkey("n", "<leader>wp", "Purge orphaned sessions", ":AutoSession purgeOrphaned<cr>")
diff --git a/pkgs/custom-neovim/config/lua/lsp.lua b/pkgs/custom-neovim/config/lua/lsp.lua
index 0b3627e..f4e47df 100644
--- a/pkgs/custom-neovim/config/lua/lsp.lua
+++ b/pkgs/custom-neovim/config/lua/lsp.lua
@@ -72,11 +72,11 @@ vim.api.nvim_create_autocmd('LspAttach', {
     end
 
     -- LSP Pickers
-    mapkey('n', "<leader>a", "Perform code action", ":FzfLua lsp_code_actions<cr>", "fzf-lua")
-    mapkey("n", "<leader>S", "Open workspace symbol picker", ":FzfLua lsp_workspace_symbols<cr>", "fzf-lua")
-    mapkey("n", "<leader>s", "Open symbol picker", ":FzfLua lsp_document_symbols<cr>", "fzf-lua")
-    mapkey("n", "<leader>I", "Open workspace diagnostic picker", ":FzfLua lsp_workspace_diagnostics<cr>", "fzf-lua")
-    mapkey("n", "<leader>i", "Open diagnostic picker", ":FzfLua lsp_document_diagnostics<cr>", "fzf-lua")
+    -- mapkey('n', "<leader>a", "Perform code action", ":FzfLua lsp_code_actions<cr>", "fzf-lua")
+    mapkey("n", "<leader>S", "Open workspace symbol picker", ":lua MiniExtra.pickers.lsp({ scope = 'workspace_symbol' })<cr>", "mini.pick")
+    mapkey("n", "<leader>s", "Open symbol picker", ":lua MiniExtra.pickers.lsp({ scope = 'document_symbol' })<cr>", "mini.pick")
+    mapkey("n", "<leader>I", "Open workspace diagnostic picker", ":lua MiniExtra.pickers.diagnostic({ scope = 'all' })<cr>", "mini.pick")
+    mapkey("n", "<leader>i", "Open diagnostic picker", ":lua MiniExtra.pickers.diagnostic({ scope = 'current' })<cr>", "mini.pick")
 
     -- 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
index e8987a9..984a2ca 100644
--- a/pkgs/custom-neovim/config/lua/plugins/fzf.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/fzf.lua
@@ -1,5 +1,6 @@
 return {
   "fzf-lua",
+  enabled = false,
   cmd = "FzfLua",
   after = function ()
     require("fzf-lua").setup {
diff --git a/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua b/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua
index b391136..68e57ec 100644
--- a/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua
+++ b/pkgs/custom-neovim/config/lua/plugins/mini-pick.lua
@@ -1,19 +1,25 @@
 return {
-  {
-    "mini.pick",
-    lazy = false,
-    before = function ()
-      vim.cmd.packadd("mini.extra")
-    end,
-    after = function ()
-      require("mini.pick").setup()
+  "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
-  },
-  {
-    "mini.extra",
-    lazy = false,
-    after = function ()
-      require("mini.extra").setup()
-    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
 }
diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index 132a34f..5fd6050 100644
--- a/pkgs/custom-neovim/default.nix
+++ b/pkgs/custom-neovim/default.nix
@@ -30,6 +30,8 @@ in
         # UI Plugins
         nvim-treesitter.withAllGrammars # All treesitter grammars
         fzf-lua
+        mini-pick
+        mini-extra
         mini-clue
         mini-files
         mini-icons