diff options
| -rw-r--r-- | cats.nix | 19 | ||||
| -rw-r--r-- | lua/plugins/picker.lua | 47 | ||||
| -rw-r--r-- | lua/plugins/ui.lua | 17 | ||||
| -rw-r--r-- | package.nix | 3 |
4 files changed, 15 insertions, 71 deletions
@@ -101,17 +101,11 @@ in trouble-nvim ]; - picker = { - mini = [ - mini-pick - mini-extra - ]; - telescope = [ - telescope-nvim - telescope-fzf-native-nvim - telescope-ui-select-nvim - ]; - }; + picker = [ + telescope-nvim + telescope-fzf-native-nvim + telescope-ui-select-nvim + ]; git = [ pkgs.neovimPlugins.neogit @@ -126,9 +120,8 @@ in }; ui = [ - # mini-indentscope hlchunk-nvim - mini-statusline + lualine-nvim ]; tsitter = [ diff --git a/lua/plugins/picker.lua b/lua/plugins/picker.lua index 478a689..bf60d6a 100644 --- a/lua/plugins/picker.lua +++ b/lua/plugins/picker.lua @@ -1,12 +1,3 @@ -local mini = function(key, action, desc) - return { - key, - "<cmd>Pick " .. action .. "<CR>", - mode = { "n" }, - desc = desc, - } -end - local telescope_builtin = function(key, action, desc) return { key, @@ -18,45 +9,9 @@ end return { { - "mini.pick", - for_cat = "core.picker.mini", - event = "DeferredUIEnter", - keys = { - mini("<leader>ff", "files", "finde files"), - mini("<leader>fb", "buffers", "Find open buffers"), - mini("<leader>fh", "help", "Find help"), - mini("<leader>/", "grep_live", "Live grep"), - - -- MiniExtra - mini("<leader>fd", "diagnostic", "Diagnostics"), - mini("<leader>fgb", "git_branches", "Git branches"), - mini("<leader>fc", "git_commits", "Git commits"), - - -- LSP scopes - mini("<leader>fr", "lsp scope='references'", "LSP references"), - mini("<leader>ds", "lsp scope='document_symbol'", "Document symbols"), - mini("<leader>ws", "lsp scope='workspace_symbol'", "Workspace symbols"), - - mini("ld", "lsp scope='definition'", "Goto definition"), - mini("ltd", "lsp scope='type_definition'", "Goto type definition"), - mini("lD", "lsp scope='declaration'", "Goto declaration"), - mini("lr", "lsp scope='references'", "Goto references"), - mini("lI", "lsp scope='implementation'", "Goto implementation"), - }, - load = function(name) - require("lzextras").loaders.multi({ - name, - "mini.extra", - }) - end, - after = function() - require("mini.pick").setup() - end, - }, - { "telescope.nvim", event = "DeferredUIEnter", - for_cat = "core.picker.telescope", + for_cat = "core.picker", keys = { telescope_builtin("<leader>ff", "find_files", "Search files in cwd"), telescope_builtin("<leader>fb", "buffers", "Search files in cwd"), diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 33d869c..493c426 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,18 +1,15 @@ return { - -- { - -- "mini.indentscope", - -- for_cats = "ui", - -- event = { "BufReadPre", "BufNewFile" }, - -- after = function() - -- require("mini.indentscope").setup({ symbol = "│" }) - -- end, - -- }, { - "mini.statusline", + "lualine.nvim", for_cats = "ui", event = { "DeferredUIEnter" }, after = function() - require("mini.statusline").setup() + require("lualine").setup({ + options = { + component_separators = { left = "|", right = "|" }, + section_separators = {}, + }, + }) end, }, { diff --git a/package.nix b/package.nix index 39e8b06..c4d78b5 100644 --- a/package.nix +++ b/package.nix @@ -48,8 +48,7 @@ let git = true; general = true; completion = true; - picker.mini = false; - picker.telescope = true; + picker = true; }; tsitter = true; }; |