From cd60d7959bfca62c90ed791b23ba2127e429954d Mon Sep 17 00:00:00 2001 From: iofq Date: Fri, 14 Mar 2025 18:38:47 -0500 Subject: [PATCH] more trouble.nvim tweaks --- nix/neovim-overlay.nix | 1 - nvim/lua/plugins/misc.lua | 11 ----------- nvim/lua/plugins/snacks.lua | 35 ++++++++++++++++++----------------- 3 files changed, 18 insertions(+), 29 deletions(-) diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix index 669a6d7..cd6b085 100644 --- a/nix/neovim-overlay.nix +++ b/nix/neovim-overlay.nix @@ -40,7 +40,6 @@ with final.pkgs.lib; let scope-nvim snacks-nvim trouble-nvim - undotree yanky-nvim ]; diff --git a/nvim/lua/plugins/misc.lua b/nvim/lua/plugins/misc.lua index 182fc85..9d2fbd7 100644 --- a/nvim/lua/plugins/misc.lua +++ b/nvim/lua/plugins/misc.lua @@ -53,17 +53,6 @@ return { }, }, }, - { - 'mbbill/undotree', - event = 'VeryLazy', - keys = { - { 'nu', 'UndotreeToggle' }, - }, - config = function() - vim.g.undotree_ShortIndicators = 1 - vim.g.undotree_SetFocusWhenToggle = 1 - end, - }, { 'EdenEast/nightfox.nvim', lazy = false, diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua index a7fd6ee..f572c56 100644 --- a/nvim/lua/plugins/snacks.lua +++ b/nvim/lua/plugins/snacks.lua @@ -22,16 +22,14 @@ return { return vim.o.columns >= 120 and "telescope" or "vertical" end }, - picker = { - sources = { - files = { hidden = true }, - grep = { hidden = true }, - explorer = { hidden = true }, - git_files = { untracked = true }, - smart = { - multi = { "buffers", "recent", "files", "git_files" } - } - }, + sources = { + files = { hidden = true }, + grep = { hidden = true }, + explorer = { hidden = true }, + git_files = { untracked = true }, + smart = { + multi = { "buffers", "recent", "files", "git_files" } + } }, actions = { trouble_open = function(...) @@ -42,8 +40,7 @@ return { input = { keys = { ["wq"] = { "close", mode = "i" }, - [""] = { "trouble_open", mode = { "n", "i" }, - }, + [""] = { "trouble_open", mode = { "n", "i" } }, } }, list = { @@ -63,7 +60,6 @@ return { { '\\\\', function() Snacks.terminal.toggle('$SHELL') end, mode = { "n", "t" }, noremap = true, desc = 'terminal open' }, { 'm', function() Snacks.words.jump(1, true) end, noremap = true, desc = 'next reference' }, { 'M', function() Snacks.words.jump(-1, true) end, noremap = true, desc = 'next reference' }, - { '\\z', function() Snacks.dim() end, noremap = true, desc = 'dim' }, { 'ff', function() Snacks.picker.smart() end, @@ -81,7 +77,7 @@ return { }, { 'fg', - function() Snacks.picker.files() end, + function() Snacks.picker.git_files() end, { noremap = true, silent = true, desc = 'Fuzzy find files' } }, { @@ -100,9 +96,14 @@ return { { noremap = true, silent = true, desc = 'See all pickers' } }, { - 'fd', - function() Snacks.picker.diagnostics() end, - { noremap = true, silent = true, desc = 'Pick diagnostics' } + 'f\'', + function() Snacks.picker.marks() end, + { noremap = true, silent = true, desc = 'Pick marks' } + }, + { + 'fu', + function() Snacks.picker.undo() end, + { noremap = true, silent = true, desc = 'Pick undotree' } }, { 'fj',