From 1a8fe9fdd6ade9e01ff68ee0b2c35153148c6d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Fri, 22 Mar 2024 21:29:48 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nvim):=20use=20La?= =?UTF-8?q?zyVim=20global=20function=20instead=20of=20importing=20the=20ut?= =?UTF-8?q?il=20module=20of=20lazyvim?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/lua/config/keymaps.lua | 7 +-- .../extras/dap/persistent-breakpoints.lua | 2 +- .../nvim/lua/plugins/extras/dap/telescope.lua | 4 +- .../plugins/extras/editor/git/worktree.lua | 2 +- .../plugins/extras/editor/marks/grapple.lua | 2 +- .../extras/editor/marks/harpoon-extended.lua | 2 +- .../lua/plugins/extras/editor/rest-client.lua | 2 +- .../extras/editor/telescope/file-browser.lua | 2 +- .../extras/editor/telescope/import.lua | 2 +- .../plugins/extras/editor/telescope/lazy.lua | 2 +- .../extras/editor/telescope/live-grep.lua | 2 +- .../extras/editor/telescope/luasnip.lua | 2 +- .../plugins/extras/editor/telescope/media.lua | 2 +- .../plugins/extras/editor/telescope/repo.lua | 2 +- .../extras/editor/telescope/undotree.lua | 2 +- .../extras/editor/telescope/workspaces.lua | 2 +- .../extras/editor/telescope/zoxide.lua | 2 +- .../extras/editor/terminal/floaterm.lua | 2 +- .../lua/plugins/extras/lazyvim/lualine.lua | 2 +- .../lua/plugins/extras/lazyvim/telescope.lua | 55 +++++++++---------- .../nvim/lua/plugins/extras/ui/zen-mode.lua | 5 +- 21 files changed, 51 insertions(+), 54 deletions(-) diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 562b12fe..6ea0693a 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -1,7 +1,6 @@ local map = vim.keymap.set local o = vim.opt -local Util = require("lazyvim.util") local lazy = require("lazy") -- Search current word @@ -17,7 +16,7 @@ map("n", "ll", "Lazy", { desc = "Lazy" }) map("n", "ld", function() vim.fn.system({ "xdg-open", "https://lazyvim.org" }) end, { desc = "LazyVim Docs" }) map("n", "lr", function() vim.fn.system({ "xdg-open", "https://github.com/LazyVim/LazyVim" }) end, { desc = "LazyVim Repo" }) map("n", "lx", "LazyExtras", { desc = "Extras" }) -map("n", "lc", function() Util.news.changelog() end, { desc = "LazyVim Changelog" }) +map("n", "lc", function() LazyVim.news.changelog() end, { desc = "LazyVim Changelog" }) map("n", "lu", function() lazy.update() end, { desc = "Lazy Update" }) map("n", "lC", function() lazy.check() end, { desc = "Lazy Check" }) @@ -157,9 +156,9 @@ map("x", "#", [[y?\V=escape(@", '?\')]]) -- Dashboard map("n", "fd", function() - if Util.has("alpha-nvim") then + if LazyVim.has("alpha-nvim") then require("alpha").start(true) - elseif Util.has("dashboard-nvim") then + elseif LazyVim.has("dashboard-nvim") then vim.cmd("Dashboard") end end, { desc = "Dashboard" }) diff --git a/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua b/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua index cdfecc48..1b6c29f2 100644 --- a/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua +++ b/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua @@ -1,7 +1,7 @@ return { { "Weissle/persistent-breakpoints.nvim", - cond = require("lazyvim.util").has("nvim-dap"), + cond = LazyVim.has("nvim-dap"), event = "LazyFile", keys = { { "dbd", "PBClearAllBreakpoints", desc = "Delete All Breakpoints" }, diff --git a/.config/nvim/lua/plugins/extras/dap/telescope.lua b/.config/nvim/lua/plugins/extras/dap/telescope.lua index d8ce824c..29950fff 100644 --- a/.config/nvim/lua/plugins/extras/dap/telescope.lua +++ b/.config/nvim/lua/plugins/extras/dap/telescope.lua @@ -1,8 +1,8 @@ return { "nvim-telescope/telescope-dap.nvim", - cond = require("lazyvim.util").has("nvim-dap"), + cond = LazyVim.has("nvim-dap"), config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("dap") end) end, diff --git a/.config/nvim/lua/plugins/extras/editor/git/worktree.lua b/.config/nvim/lua/plugins/extras/editor/git/worktree.lua index 9b44c360..46a3be62 100644 --- a/.config/nvim/lua/plugins/extras/editor/git/worktree.lua +++ b/.config/nvim/lua/plugins/extras/editor/git/worktree.lua @@ -3,7 +3,7 @@ return { "ThePrimeagen/git-worktree.nvim", opts = {}, config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("git_worktree") end) end, diff --git a/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua b/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua index b691a358..f926cce7 100644 --- a/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua +++ b/.config/nvim/lua/plugins/extras/editor/marks/grapple.lua @@ -28,7 +28,7 @@ return { keys = keys, config = function() require("grapple").setup() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("grapple") end) end, diff --git a/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua b/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua index 8278fc4d..869f1e50 100644 --- a/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua +++ b/.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua @@ -46,7 +46,7 @@ return { end, }) - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("harpoon") end) end, diff --git a/.config/nvim/lua/plugins/extras/editor/rest-client.lua b/.config/nvim/lua/plugins/extras/editor/rest-client.lua index 003f32df..351c444d 100644 --- a/.config/nvim/lua/plugins/extras/editor/rest-client.lua +++ b/.config/nvim/lua/plugins/extras/editor/rest-client.lua @@ -52,7 +52,7 @@ return { }, config = function(_, opts) require("rest-nvim").setup(opts) - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("rest") end) end, diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/file-browser.lua b/.config/nvim/lua/plugins/extras/editor/telescope/file-browser.lua index 3505fc1d..f94479f0 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/file-browser.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/file-browser.lua @@ -1,7 +1,7 @@ return { "nvim-telescope/telescope-file-browser.nvim", config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").setup({ extensions = { file_browser = { diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/import.lua b/.config/nvim/lua/plugins/extras/editor/telescope/import.lua index d6b1de78..f209407c 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/import.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/import.lua @@ -2,7 +2,7 @@ return { "piersolenski/telescope-import.nvim", opts = {}, config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").setup({ extensions = { import = { diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/lazy.lua b/.config/nvim/lua/plugins/extras/editor/telescope/lazy.lua index 6aeef49a..752e10a5 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/lazy.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/lazy.lua @@ -1,7 +1,7 @@ return { "tsakirist/telescope-lazy.nvim", config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("lazy") end) end, diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/live-grep.lua b/.config/nvim/lua/plugins/extras/editor/telescope/live-grep.lua index d7afb701..f3e3bce4 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/live-grep.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/live-grep.lua @@ -1,7 +1,7 @@ return { "nvim-telescope/telescope-live-grep-args.nvim", config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("lazy") end) end, diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/luasnip.lua b/.config/nvim/lua/plugins/extras/editor/telescope/luasnip.lua index 126d4890..9a45a03d 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/luasnip.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/luasnip.lua @@ -1,7 +1,7 @@ return { "benfowler/telescope-luasnip.nvim", config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("luasnip") end) end, diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/media.lua b/.config/nvim/lua/plugins/extras/editor/telescope/media.lua index 1482dd8c..54cdceb7 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/media.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/media.lua @@ -1,7 +1,7 @@ return { "dharmx/telescope-media.nvim", config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").setup({ extensions = { media = { diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/repo.lua b/.config/nvim/lua/plugins/extras/editor/telescope/repo.lua index bd6e0aa3..6b8df91e 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/repo.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/repo.lua @@ -15,7 +15,7 @@ return { }, opts = {}, config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").setup({ extensions = { repo = { diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/undotree.lua b/.config/nvim/lua/plugins/extras/editor/telescope/undotree.lua index bc840c9e..757cc809 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/undotree.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/undotree.lua @@ -3,7 +3,7 @@ return { "debugloop/telescope-undo.nvim", opts = {}, config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").setup({ extensions = { undo = { diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/workspaces.lua b/.config/nvim/lua/plugins/extras/editor/telescope/workspaces.lua index b647e10f..51e78aa9 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/workspaces.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/workspaces.lua @@ -18,7 +18,7 @@ return { open = { "Telescope find_files" }, }, }) - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("workspaces") end) end, diff --git a/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua b/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua index 3c67ea15..5002a24f 100644 --- a/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua +++ b/.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua @@ -2,7 +2,7 @@ return { { "jvgrootveld/telescope-zoxide", config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").setup({ extensions = { zoxide = { diff --git a/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua b/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua index a73c4673..50d59848 100644 --- a/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua +++ b/.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua @@ -27,7 +27,7 @@ return { { "dawsers/telescope-floaterm.nvim", config = function() - require("lazyvim.util").on_load("telescope.nvim", function() + LazyVim.on_load("telescope.nvim", function() require("telescope").load_extension("floaterm") end) end, diff --git a/.config/nvim/lua/plugins/extras/lazyvim/lualine.lua b/.config/nvim/lua/plugins/extras/lazyvim/lualine.lua index 43324379..3b037acb 100644 --- a/.config/nvim/lua/plugins/extras/lazyvim/lualine.lua +++ b/.config/nvim/lua/plugins/extras/lazyvim/lualine.lua @@ -33,7 +33,7 @@ return { opts.sections.lualine_a = { { "mode", icon = "" } } opts.sections.lualine_c[4] = { - require("lazyvim.util.lualine").pretty_path({ + LazyVim.lualine.pretty_path({ filename_hl = "Bold", modified_hl = "MatchParen", directory_hl = "Conceal", diff --git a/.config/nvim/lua/plugins/extras/lazyvim/telescope.lua b/.config/nvim/lua/plugins/extras/lazyvim/telescope.lua index f87ec5d5..ffd9761a 100644 --- a/.config/nvim/lua/plugins/extras/lazyvim/telescope.lua +++ b/.config/nvim/lua/plugins/extras/lazyvim/telescope.lua @@ -1,4 +1,3 @@ -local Util = require("lazyvim.util") local actions = require("telescope.actions") return { @@ -8,39 +7,39 @@ return { keys = { { "ssa", - Util.telescope("lsp_document_symbols", { symbols = { "Class", "Function", "Method", "Constructor", "Interface", "Module", "Struct", "Trait", "Field", "Property", "Enum", "Constant" } }), + LazyVim.telescope("lsp_document_symbols", { symbols = { "Class", "Function", "Method", "Constructor", "Interface", "Module", "Struct", "Trait", "Field", "Property", "Enum", "Constant" } }), desc = "All", }, - { "ssc", Util.telescope("lsp_document_symbols", { symbols = { "Class" } }), desc = "Class" }, - { "ssf", Util.telescope("lsp_document_symbols", { symbols = { "Function" } }), desc = "Function" }, - { "ssm", Util.telescope("lsp_document_symbols", { symbols = { "Method" } }), desc = "Method" }, - { "ssC", Util.telescope("lsp_document_symbols", { symbols = { "Constructor" } }), desc = "Constructor" }, - { "sse", Util.telescope("lsp_document_symbols", { symbols = { "Enum" } }), desc = "Enum" }, - { "ssi", Util.telescope("lsp_document_symbols", { symbols = { "Interface" } }), desc = "Interface" }, - { "ssM", Util.telescope("lsp_document_symbols", { symbols = { "Module" } }), desc = "Module" }, - { "sss", Util.telescope("lsp_document_symbols", { symbols = { "Struct" } }), desc = "Struct" }, - { "sst", Util.telescope("lsp_document_symbols", { symbols = { "Trait" } }), desc = "Trait" }, - { "ssF", Util.telescope("lsp_document_symbols", { symbols = { "Field" } }), desc = "Field" }, - { "ssp", Util.telescope("lsp_document_symbols", { symbols = { "Property" } }), desc = "Property" }, - { "ssv", Util.telescope("lsp_document_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" }, + { "ssc", LazyVim.telescope("lsp_document_symbols", { symbols = { "Class" } }), desc = "Class" }, + { "ssf", LazyVim.telescope("lsp_document_symbols", { symbols = { "Function" } }), desc = "Function" }, + { "ssm", LazyVim.telescope("lsp_document_symbols", { symbols = { "Method" } }), desc = "Method" }, + { "ssC", LazyVim.telescope("lsp_document_symbols", { symbols = { "Constructor" } }), desc = "Constructor" }, + { "sse", LazyVim.telescope("lsp_document_symbols", { symbols = { "Enum" } }), desc = "Enum" }, + { "ssi", LazyVim.telescope("lsp_document_symbols", { symbols = { "Interface" } }), desc = "Interface" }, + { "ssM", LazyVim.telescope("lsp_document_symbols", { symbols = { "Module" } }), desc = "Module" }, + { "sss", LazyVim.telescope("lsp_document_symbols", { symbols = { "Struct" } }), desc = "Struct" }, + { "sst", LazyVim.telescope("lsp_document_symbols", { symbols = { "Trait" } }), desc = "Trait" }, + { "ssF", LazyVim.telescope("lsp_document_symbols", { symbols = { "Field" } }), desc = "Field" }, + { "ssp", LazyVim.telescope("lsp_document_symbols", { symbols = { "Property" } }), desc = "Property" }, + { "ssv", LazyVim.telescope("lsp_document_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" }, { "sSa", - Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class", "Function", "Method", "Constructor", "Interface", "Module", "Struct", "Trait", "Field", "Property", "Enum", "Constant" } }), + LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class", "Function", "Method", "Constructor", "Interface", "Module", "Struct", "Trait", "Field", "Property", "Enum", "Constant" } }), desc = "All", }, - { "sSc", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class" } }), desc = "Class" }, - { "sSf", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Function" } }), desc = "Function" }, - { "sSm", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Method" } }), desc = "Method" }, - { "sSC", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Constructor" } }), desc = "Constructor" }, - { "sSe", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Enum" } }), desc = "Enum" }, - { "sSi", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Interface" } }), desc = "Interface" }, - { "sSM", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Module" } }), desc = "Module" }, - { "sSs", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Struct" } }), desc = "Struct" }, - { "sSt", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Trait" } }), desc = "Trait" }, - { "sSF", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Field" } }), desc = "Field" }, - { "sSp", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Property" } }), desc = "Property" }, - { "sSv", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" }, - { "sA", Util.telescope("treesitter"), desc = "Treesitter Symbols" }, + { "sSc", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class" } }), desc = "Class" }, + { "sSf", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Function" } }), desc = "Function" }, + { "sSm", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Method" } }), desc = "Method" }, + { "sSC", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Constructor" } }), desc = "Constructor" }, + { "sSe", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Enum" } }), desc = "Enum" }, + { "sSi", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Interface" } }), desc = "Interface" }, + { "sSM", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Module" } }), desc = "Module" }, + { "sSs", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Struct" } }), desc = "Struct" }, + { "sSt", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Trait" } }), desc = "Trait" }, + { "sSF", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Field" } }), desc = "Field" }, + { "sSp", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Property" } }), desc = "Property" }, + { "sSv", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" }, + { "sA", LazyVim.telescope("treesitter"), desc = "Treesitter Symbols" }, { "gf", "Telescope git_bcommits", desc = "File History" }, { "gS", "Telescope git_stash", desc = "stash" }, { "gb", "Telescope git_branches", desc = "branches" }, diff --git a/.config/nvim/lua/plugins/extras/ui/zen-mode.lua b/.config/nvim/lua/plugins/extras/ui/zen-mode.lua index 0dd42202..f90439be 100644 --- a/.config/nvim/lua/plugins/extras/ui/zen-mode.lua +++ b/.config/nvim/lua/plugins/extras/ui/zen-mode.lua @@ -1,4 +1,3 @@ -local Util = require("lazyvim.util") local executeCommandIfExists = function(command) if vim.fn.exists(command) ~= 0 then vim.cmd(command) @@ -18,7 +17,7 @@ return { executeCommandIfExists(":LspLensOff") executeCommandIfExists(":NvimContextVtDisable") executeCommandIfExists(":IBLDisable") - Util.toggle.inlay_hints() + LazyVim.toggle.inlay_hints() executeCommandIfExists(":Gitsigns toggle_current_line_blame") executeCommandIfExists(":CccHighlighterDisable") end, @@ -29,7 +28,7 @@ return { executeCommandIfExists(":LspLensOn") executeCommandIfExists(":NvimContextVtEnable") executeCommandIfExists(":IBLEnable") - Util.toggle.inlay_hints() + LazyVim.toggle.inlay_hints() executeCommandIfExists(":Gitsigns toggle_current_line_blame") executeCommandIfExists(":CccHighlighterEnable") end,