From 5d7b037e995762e0dd133d2e3a5dee32d381ec1e Mon Sep 17 00:00:00 2001 From: Jeremie Fraeys Date: Sun, 8 Feb 2026 15:27:48 -0500 Subject: [PATCH] fix: remove telescope-undo references since plugin was removed --- lua/custom/plugins/diffview.lua | 5 ++++ lua/custom/plugins/harpoon.lua | 11 ++++++--- lua/custom/plugins/lualine.lua | 3 ++- lua/custom/plugins/telescope.lua | 39 ++++++++++---------------------- lua/custom/plugins/worktree.lua | 17 ++++---------- 5 files changed, 31 insertions(+), 44 deletions(-) diff --git a/lua/custom/plugins/diffview.lua b/lua/custom/plugins/diffview.lua index 3d69f39..74f64b3 100755 --- a/lua/custom/plugins/diffview.lua +++ b/lua/custom/plugins/diffview.lua @@ -1,5 +1,10 @@ return { 'sindrets/diffview.nvim', + cmd = { 'DiffviewOpen', 'DiffviewClose', 'DiffviewToggleFiles', 'DiffviewFocusFiles' }, + keys = { + { 'gd', 'DiffviewOpen', desc = 'Git: Diffview open' }, + { 'gD', 'DiffviewClose', desc = 'Git: Diffview close' }, + }, dependencies = { 'nvim-lua/plenary.nvim' }, opts = {}, } diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua index 4cc2219..d543e10 100755 --- a/lua/custom/plugins/harpoon.lua +++ b/lua/custom/plugins/harpoon.lua @@ -1,10 +1,15 @@ return { 'theprimeagen/harpoon', branch = 'harpoon2', - dependencies = { - 'nvim-lua/plenary.nvim', - -- 'nvim-telescope/telescope.nvim', + keys = { + { 'a', desc = 'Harpoon: Add file' }, + { '', desc = 'Harpoon: Toggle menu' }, + { '', desc = 'Harpoon: Select 1/Prev' }, + { '', desc = 'Harpoon: Select 2' }, + { '', desc = 'Harpoon: Select 3' }, + { '', desc = 'Harpoon: Select 4/Next' }, }, + dependencies = { 'nvim-lua/plenary.nvim' }, config = function() local harpoon = require('harpoon') -- local actions = require('telescope.actions') diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua index 23c63b8..b39f67a 100755 --- a/lua/custom/plugins/lualine.lua +++ b/lua/custom/plugins/lualine.lua @@ -1,5 +1,6 @@ return { 'nvim-lualine/lualine.nvim', + event = 'VeryLazy', dependencies = { 'nvim-tree/nvim-web-devicons', 'tpope/vim-fugitive' }, config = function() require('lualine').setup({ @@ -30,7 +31,7 @@ return { 'filetype', }, }, - extensions = { 'fugitive', 'nvim-tree' }, + extensions = { 'fugitive', 'nvim-tree', 'fzf' }, }) end, } diff --git a/lua/custom/plugins/telescope.lua b/lua/custom/plugins/telescope.lua index 57b19bc..ede1521 100755 --- a/lua/custom/plugins/telescope.lua +++ b/lua/custom/plugins/telescope.lua @@ -3,27 +3,17 @@ return { 'nvim-telescope/telescope.nvim', cmd = 'Telescope', version = '*', + keys = { + { 'ff', 'Telescope find_files', desc = 'Find Files' }, + { 'fg', 'Telescope live_grep', desc = 'Live Grep' }, + { 'fb', 'Telescope buffers', desc = 'Buffers' }, + { 'fh', 'Telescope help_tags', desc = 'Help Tags' }, + { 'fr', 'Telescope oldfiles', desc = 'Recent Files' }, + }, dependencies = { 'nvim-lua/plenary.nvim', - 'debugloop/telescope-undo.nvim', -- Undo history extension - { - 'nvim-telescope/telescope-fzf-native.nvim', - build = 'make', - config = function() - require('telescope').setup({ - extensions = { - fzf = {}, - }, - }) - require('telescope').load_extension('fzf') - end, - cond = function() - return vim.fn.executable('make') == 1 - end, - }, - 'nvim-tree/nvim-web-devicons', -- Optional: Icons for UI - 'mbbill/undotree', -- Undotree dependency - -- 'b0o/schemastore.nvim', -- YAML schema support + { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, + 'nvim-tree/nvim-web-devicons', }, config = function() local telescope = require('telescope') @@ -56,17 +46,12 @@ return { end, }, extensions = { - undo = { - use_delta = true, -- Use delta for better diff visualization - }, + fzf = {}, }, }) - -- Load the undo extension for Telescope - telescope.load_extension('undo') - - -- Load yaml schemas for Telescope - -- telescope.load_extension('yaml_schema') + -- Load the fzf extension for Telescope + telescope.load_extension('fzf') -- Function to find git root directory local function find_git_root() diff --git a/lua/custom/plugins/worktree.lua b/lua/custom/plugins/worktree.lua index de8ebe1..bc50ee2 100644 --- a/lua/custom/plugins/worktree.lua +++ b/lua/custom/plugins/worktree.lua @@ -1,20 +1,11 @@ return { 'ThePrimeagen/git-worktree.nvim', + keys = { + { 'ga', "lua require('telescope').extensions.git_worktree.git_worktree()", desc = 'Git Worktrees' }, + { 'gn', "lua require('telescope').extensions.git_worktree.create_git_worktree()", desc = 'New Git Worktree' }, + }, config = function() require('git-worktree').setup() require('telescope').load_extension('git_worktree') - - vim.keymap.set( - 'n', - 'ga', - "lua require('telescope').extensions.git_worktree.git_worktree()", - { desc = 'Git Worktrees' } - ) - vim.keymap.set( - 'n', - 'gn', - "lua require('telescope').extensions.git_worktree.create_git_worktree()", - { desc = 'New Git Worktree' } - ) end, }