From 506917ede55bcd7c7c76e4859f5b34c4263ec97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Sat, 25 Nov 2023 18:32:17 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nvim):=20added=20?= =?UTF-8?q?telescope=20extensions=20as=20individual=20extras=20for=20more?= =?UTF-8?q?=20modularity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/lazyvim.json | 7 + .../extras/editor/telescope/all-recent.lua | 27 ++++ .../plugins/extras/editor/telescope/dap.lua | 37 ++++++ .../extras/editor/telescope/import.lua | 21 +++ .../plugins/extras/editor/telescope/lazy.lua | 13 ++ .../extras/editor/telescope/luasnip.lua | 13 ++ .../extras/editor/telescope/urlview.lua | 8 ++ .../extras/editor/telescope/zoxide.lua | 37 ++++++ .config/nvim/lua/plugins/telescope.lua | 123 ------------------ 9 files changed, 163 insertions(+), 123 deletions(-) create mode 100644 .config/nvim/lua/plugins/extras/editor/telescope/all-recent.lua create mode 100644 .config/nvim/lua/plugins/extras/editor/telescope/dap.lua create mode 100644 .config/nvim/lua/plugins/extras/editor/telescope/import.lua create mode 100644 .config/nvim/lua/plugins/extras/editor/telescope/lazy.lua create mode 100644 .config/nvim/lua/plugins/extras/editor/telescope/luasnip.lua create mode 100644 .config/nvim/lua/plugins/extras/editor/telescope/urlview.lua create mode 100644 .config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 1efa6b4f..6e24e9a2 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -50,8 +50,15 @@ "plugins.extras.editor.ssr", "plugins.extras.editor.suda", "plugins.extras.editor.tabscope", + "plugins.extras.editor.telescope.all-recent", + "plugins.extras.editor.telescope.dap", + "plugins.extras.editor.telescope.import", + "plugins.extras.editor.telescope.lazy", + "plugins.extras.editor.telescope.luasnip", "plugins.extras.editor.telescope.repo", "plugins.extras.editor.telescope.undotree", + "plugins.extras.editor.telescope.urlview", + "plugins.extras.editor.telescope.zoxide", "plugins.extras.editor.winshift", "plugins.extras.formatting.isort", "plugins.extras.formatting.rustfmt", diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/all-recent.lua b/.config/nvim/lua/plugins/extras/editor/telescope/all-recent.lua new file mode 100644 index 00000000..1b3db11e --- /dev/null +++ b/.config/nvim/lua/plugins/extras/editor/telescope/all-recent.lua @@ -0,0 +1,27 @@ +return { + "nvim-telescope/telescope.nvim", + dependencies = { + "prochri/telescope-all-recent.nvim", + dependencies = { + "kkharji/sqlite.lua", + }, + opts = { + pickers = { + ["workspaces.nvim#workspaces"] = { + disable = false, + sorting = "frecency", + }, + ["project.nvim#projects"] = { + disable = false, + sorting = "frecency", + }, + ["yanky.nvim#yank_history"] = { + disable = true, + }, + ["zoxide.nvim#zoxide"] = { + disable = true, + }, + }, + }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/dap.lua b/.config/nvim/lua/plugins/extras/editor/telescope/dap.lua new file mode 100644 index 00000000..c43ce854 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/editor/telescope/dap.lua @@ -0,0 +1,37 @@ +local Util = require("lazyvim.util") + +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", + }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/import.lua b/.config/nvim/lua/plugins/extras/editor/telescope/import.lua new file mode 100644 index 00000000..edd4998a --- /dev/null +++ b/.config/nvim/lua/plugins/extras/editor/telescope/import.lua @@ -0,0 +1,21 @@ +local Util = require("lazyvim.util") + +return { + "piersolenski/telescope-import.nvim", + opts = {}, + config = function(_, opts) + Util.on_load("telescope.nvim", function() + require("telescope").setup({ + extensions = { + import = { + insert_at_top = true, + }, + }, + }) + require("telescope").load_extension("import") + end) + end, + keys = { + { "si", "Telescope import", desc = "Imports" }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/lazy.lua b/.config/nvim/lua/plugins/extras/editor/telescope/lazy.lua new file mode 100644 index 00000000..ecfeaba9 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/editor/telescope/lazy.lua @@ -0,0 +1,13 @@ +local Util = require("lazyvim.util") + +return { + "tsakirist/telescope-lazy.nvim", + config = function() + Util.on_load("telescope.nvim", function() + require("telescope").load_extension("lazy") + end) + end, + keys = { + { "sp", "Telescope lazy", desc = "Plugins (Lazy)" }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/luasnip.lua b/.config/nvim/lua/plugins/extras/editor/telescope/luasnip.lua new file mode 100644 index 00000000..aaeabfaf --- /dev/null +++ b/.config/nvim/lua/plugins/extras/editor/telescope/luasnip.lua @@ -0,0 +1,13 @@ +local Util = require("lazyvim.util") + +return { + "benfowler/telescope-luasnip.nvim", + config = function() + Util.on_load("telescope.nvim", function() + require("telescope").load_extension("luasnip") + end) + end, + keys = { + { "sl", "Telescope luasnip", desc = "Luasnip (Snippets)" }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/urlview.lua b/.config/nvim/lua/plugins/extras/editor/telescope/urlview.lua new file mode 100644 index 00000000..6c012c6c --- /dev/null +++ b/.config/nvim/lua/plugins/extras/editor/telescope/urlview.lua @@ -0,0 +1,8 @@ +return { + "axieax/urlview.nvim", + cmd = { "UrlView" }, + keys = { { "sU", "UrlView", desc = "Search Urls" } }, + opts = { + default_picker = "telescope", + }, +} diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua b/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua new file mode 100644 index 00000000..03296602 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua @@ -0,0 +1,37 @@ +local Util = require("lazyvim.util") + +return { + { + "jvgrootveld/telescope-zoxide", + config = function(_, opts) + Util.on_load("telescope.nvim", function() + require("telescope").setup({ + extensions = { + zoxide = { + mappings = { + default = { + after_action = function(selection) + require("telescope.builtin").find_files({ cwd = selection.path }) + end, + }, + }, + }, + }, + }) + require("telescope").load_extension("zoxide") + end) + end, + keys = { + { "fz", "Telescope zoxide list", desc = "Zoxide" }, + }, + }, + { + "goolord/alpha-nvim", + opts = function(_, dashboard) + local button = dashboard.button("z", " " .. " Zoxide", "Telescope zoxide list ") + button.opts.hl = "AlphaButtons" + button.opts.hl_shortcut = "AlphaShortcut" + table.insert(dashboard.section.buttons.val, 5, button) + end, + }, +} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 1144c48d..37d7f608 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -5,24 +5,6 @@ return { { "nvim-telescope/telescope.nvim", dependencies = { - { - "piersolenski/telescope-import.nvim", - config = function(_, opts) - Util.on_load("telescope.nvim", function() - require("telescope").setup({ - extensions = { - import = { - insert_at_top = true, - }, - }, - }) - require("telescope").load_extension("import") - end) - end, - keys = { - { "si", "Telescope import", desc = "Imports" }, - }, - }, { "nvim-telescope/telescope-fzf-native.nvim", build = "make", @@ -33,105 +15,8 @@ return { end) end, }, - { - "prochri/telescope-all-recent.nvim", - dependencies = { - "kkharji/sqlite.lua", - }, - opts = { - pickers = { - ["workspaces.nvim#workspaces"] = { - disable = false, - sorting = "frecency", - }, - ["project.nvim#projects"] = { - disable = false, - sorting = "frecency", - }, - ["yanky.nvim#yank_history"] = { - disable = true, - }, - ["zoxide.nvim#zoxide"] = { - disable = true, - }, - }, - }, - }, - { - "nvim-telescope/telescope-dap.nvim", - config = function() - Util.on_load("telescope.nvim", function() - require("telescope").load_extension("dap") - end) - end, - }, - { - "benfowler/telescope-luasnip.nvim", - config = function() - Util.on_load("telescope.nvim", function() - require("telescope").load_extension("luasnip") - end) - end, - }, - { - "jvgrootveld/telescope-zoxide", - config = function(_, opts) - Util.on_load("telescope.nvim", function() - require("telescope").setup({ - extensions = { - zoxide = { - mappings = { - default = { - after_action = function(selection) - require("telescope.builtin").find_files({ cwd = selection.path }) - end, - }, - }, - }, - }, - }) - require("telescope").load_extension("zoxide") - end) - end, - }, - { - "tsakirist/telescope-lazy.nvim", - config = function() - Util.on_load("telescope.nvim", function() - require("telescope").load_extension("lazy") - 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", - }, - { "fz", "Telescope zoxide list", desc = "Zoxide" }, - { "sp", "Telescope lazy", desc = "Plugins (Lazy)" }, - { "sl", "Telescope luasnip", desc = "Luasnip (Snippets)" }, { "ssa", Util.telescope("lsp_document_symbols", { @@ -442,12 +327,4 @@ return { }, }, }, - { - "axieax/urlview.nvim", - cmd = { "UrlView" }, - keys = { { "sU", "UrlView", desc = "Search Urls" } }, - opts = { - default_picker = "telescope", - }, - }, }