From 0d25f5307792a92a88e4f859435023d5846c949d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Wed, 18 Oct 2023 11:59:29 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nvim):=20changed?= =?UTF-8?q?=20worktree=20and=20dap=20plugins=20to=20be=20dependencies=20of?= =?UTF-8?q?=20telescope=20instead=20of=20single=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit now, we have less garbage open at startup also did cleaning of the default options of lazy that i didnt touch, now there are only my edits --- .config/nvim/lua/plugins/git-worktree.lua | 17 -- .config/nvim/lua/plugins/telescope-dap.lua | 10 - .config/nvim/lua/plugins/telescope.lua | 290 +++++++-------------- 3 files changed, 94 insertions(+), 223 deletions(-) delete mode 100644 .config/nvim/lua/plugins/git-worktree.lua delete mode 100644 .config/nvim/lua/plugins/telescope-dap.lua diff --git a/.config/nvim/lua/plugins/git-worktree.lua b/.config/nvim/lua/plugins/git-worktree.lua deleted file mode 100644 index 93a9dab6..00000000 --- a/.config/nvim/lua/plugins/git-worktree.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - { - "ThePrimeagen/git-worktree.nvim", - opts = {}, - config = function() - require("telescope").load_extension("git_worktree") - end, - dependencies = { - "nvim-telescope/telescope.nvim", - }, - --stylua: ignore - keys = { - {"gwm", function() require("telescope").extensions.git_worktree.git_worktrees() end, desc = "Manage Worktrees"}, - {"gwc", function() require("telescope").extensions.git_worktree.create_git_worktree() end, desc = "Create Worktree"}, - }, - }, -} diff --git a/.config/nvim/lua/plugins/telescope-dap.lua b/.config/nvim/lua/plugins/telescope-dap.lua deleted file mode 100644 index a4a3ae6b..00000000 --- a/.config/nvim/lua/plugins/telescope-dap.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - { - "nvim-telescope/telescope-dap.nvim", - requires = { "nvim-telescope/telescope.nvim" }, - enabled = false, - config = function() - require("telescope").load_extension("dap") - end, - }, -} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index d1a4ab6f..553aca33 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -1,11 +1,9 @@ local Util = require("lazyvim.util") +local actions = require("telescope.actions") return { { "nvim-telescope/telescope.nvim", - commit = vim.fn.has("nvim-0.9.0") == 0 and "057ee0f8783" or nil, - cmd = "Telescope", - version = false, -- telescope did only one release, so use HEAD for now dependencies = { { "nvim-telescope/telescope-fzf-native.nvim", @@ -26,6 +24,20 @@ return { end) end, }, + { + "ThePrimeagen/git-worktree.nvim", + opts = {}, + config = function(_, opts) + Util.on_load("telescope.nvim", function() + require("telescope").load_extension("git_worktree") + end) + end, + --stylua: ignore + keys = { + {"gwm", function() require("telescope").extensions.git_worktree.git_worktrees() end, desc = "Manage Worktrees"}, + {"gwc", function() require("telescope").extensions.git_worktree.create_git_worktree() end, desc = "Create Worktree"}, + }, + }, { "prochri/telescope-all-recent.nvim", opts = { @@ -47,6 +59,41 @@ return { }, }, }, + { + "nvim-telescope/telescope-dap.nvim", + config = function() + Util.on_load("telescope.nvim", function() + require("telescope").load_extension("dap") + end) + end, + keys = { + { + "dm", + "Telescope dap commands", + desc = "Commands", + }, + { + "df", + "Telescope dap frames", + desc = "Frames", + }, + { + "dG", + "Telescope dap configurations", + desc = "Configurations", + }, + { + "dL", + "Telescope dap list_breakpoints", + desc = "List Breakpoints", + }, + { + "dv", + "Telescope dap variables", + desc = "Variables", + }, + }, + }, { "benfowler/telescope-luasnip.nvim", config = function() @@ -81,108 +128,9 @@ return { }, }, keys = { - { - ",", - "Telescope buffers show_all_buffers=true", - desc = "Switch Buffer", - }, - { - "/", - Util.telescope("live_grep"), - desc = "Grep (root dir)", - }, - { - ":", - "Telescope command_history", - desc = "Command History", - }, - { - "", - Util.telescope("files"), - desc = "Find Files (root dir)", - }, - -- find - { "fb", "Telescope buffers", desc = "Buffers" }, - { - "ff", - Util.telescope("files"), - desc = "Find Files (root dir)", - }, - { - "fF", - Util.telescope("files", { cwd = false }), - desc = "Find Files (cwd)", - }, - { "fr", "Telescope oldfiles", desc = "Recent" }, - { "fR", Util.telescope("oldfiles", { cwd = vim.loop.cwd() }), desc = "Recent (cwd)" }, - -- git { "gC", "Telescope git_commits", desc = "Commits" }, - { "gs", "Telescope git_status", desc = "Status" }, - -- search - { 's"', "Telescope registers", desc = "Registers" }, - { - "sa", - "Telescope autocommands", - desc = "Auto Commands", - }, - { "sb", "Telescope current_buffer_fuzzy_find", desc = "Buffer" }, - { - "sc", - "Telescope command_history", - desc = "Command History", - }, - { "sC", "Telescope commands", desc = "Commands" }, - { - "sd", - "Telescope diagnostics bufnr=0", - desc = "Document diagnostics", - }, - { - "sD", - "Telescope diagnostics", - desc = "Workspace diagnostics", - }, - { - "sg", - Util.telescope("live_grep"), - desc = "Grep (root dir)", - }, - { "sG", Util.telescope("live_grep", { cwd = false }), desc = "Grep (cwd)" }, - { "sh", "Telescope help_tags", desc = "Help Pages" }, - { - "sH", - "Telescope highlights", - desc = "Search Highlight Groups", - }, - { "sk", "Telescope keymaps", desc = "Key Maps" }, - { "sM", "Telescope man_pages", desc = "Man Pages" }, - { "sm", "Telescope marks", desc = "Jump to Mark" }, - { "so", "Telescope vim_options", desc = "Options" }, - { "sR", "Telescope resume", desc = "Resume" }, + { "cu", "Telescope undo", desc = "Undotree" }, - { - "sw", - Util.telescope("grep_string", { word_match = "-w" }), - desc = "Word (root dir)", - }, - { "sW", Util.telescope("grep_string", { cwd = false, word_match = "-w" }), desc = "Word (cwd)" }, - { - "sw", - Util.telescope("grep_string"), - mode = "v", - desc = "Selection (root dir)", - }, - { - "sW", - Util.telescope("grep_string", { cwd = false }), - mode = "v", - desc = "Selection (cwd)", - }, - { - "uC", - Util.telescope("colorscheme", { enable_preview = true }), - desc = "Colorscheme with preview", - }, { "ssa", Util.telescope("lsp_document_symbols", { @@ -448,101 +396,51 @@ return { desc = "Treesitter Symbols", }, }, - opts = function() - local actions = require("telescope.actions") - local open_with_trouble = function(...) - return require("trouble.providers.telescope").open_with_trouble(...) - end + opts = { + defaults = { - local open_selected_with_trouble = function(...) - return require("trouble.providers.telescope").open_selected_with_trouble(...) - end - - local find_files_no_ignore = function() - local action_state = require("telescope.actions.state") - local line = action_state.get_current_line() - Util.telescope("find_files", { no_ignore = true, default_text = line })() - end - - local find_files_with_hidden = function() - local action_state = require("telescope.actions.state") - local line = action_state.get_current_line() - Util.telescope("find_files", { hidden = true, default_text = line })() - end - - return { - defaults = { - prompt_prefix = " ", - selection_caret = " ", - -- open files in the first window that is an actual file. - -- use the current window if no other window is available. - get_selection_window = function() - local wins = vim.api.nvim_list_wins() - table.insert(wins, 1, vim.api.nvim_get_current_win()) - for _, win in ipairs(wins) do - local buf = vim.api.nvim_win_get_buf(win) - if vim.bo[buf].buftype == "" then - return win - end - end - return 0 - end, - mappings = { - i = { - [""] = open_with_trouble, - [""] = open_selected_with_trouble, - [""] = find_files_no_ignore, - [""] = find_files_with_hidden, - [""] = actions.cycle_history_next, - [""] = actions.cycle_history_prev, - [""] = actions.preview_scrolling_down, - [""] = actions.preview_scrolling_up, - [""] = actions.move_selection_previous, - [""] = actions.move_selection_next, - [""] = actions.send_selected_to_qflist + actions.open_qflist, - [""] = actions.close, - [""] = false, - [""] = actions.delete_buffer + actions.move_to_top, - }, - n = { - ["q"] = actions.close, - }, - }, - file_ignore_patterns = { - ".gitignore", - "node_modules", - "build", - "dist", - "yarn.lock", - "*.git/*", - "*/tmp/*", - }, - pickers = { - find_files = { - hidden = true, - }, - }, - extensions = { - undo = { - side_by_side = true, - layout_strategy = "vertical", - layout_config = { - preview_height = 0.65, - }, - }, - import = { - insert_at_top = true, - }, - fzf = { - fuzzy = true, - override_generic_sorter = true, - override_file_sorter = true, - case_mode = "smart_case", - }, + mappings = { + i = { + [""] = actions.move_selection_previous, + [""] = actions.move_selection_next, + [""] = actions.close, + [""] = false, }, }, - require("telescope").load_extension("refactoring"), - } - end, + file_ignore_patterns = { + ".gitignore", + "node_modules", + "build", + "dist", + "yarn.lock", + "*.git/*", + "*/tmp/*", + }, + pickers = { + find_files = { + hidden = true, + }, + }, + extensions = { + undo = { + side_by_side = true, + layout_strategy = "vertical", + layout_config = { + preview_height = 0.65, + }, + }, + import = { + insert_at_top = true, + }, + fzf = { + fuzzy = true, + override_generic_sorter = true, + override_file_sorter = true, + case_mode = "smart_case", + }, + }, + }, + require("telescope").load_extension("refactoring"), + }, }, }