kayprish/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

♻️ refactor(nvim): use LazyVim global function instead of importing the util module of lazyvim

Browse source
This commit is contained in:
Sergio Laín 2024-03-22 21:29:48 +01:00
parent cf71f2e44e
commit 1a8fe9fdd6
No known key found for this signature in database
GPG key ID: 14C9B8080681777B
21 changed files with 51 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.config/nvim/lua/config/keymaps.lua
View file

@ -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", "<leader>ll", "<cmd>Lazy<cr>", { desc = "Lazy" })
map("n", "<leader>ld", function() vim.fn.system({ "xdg-open", "https://lazyvim.org" }) end, { desc = "LazyVim Docs" })
map("n", "<leader>lr", function() vim.fn.system({ "xdg-open", "https://github.com/LazyVim/LazyVim" }) end, { desc = "LazyVim Repo" })
map("n", "<leader>lx", "<cmd>LazyExtras<cr>", { desc = "Extras" })
map("n", "<leader>lc", function() Util.news.changelog() end, { desc = "LazyVim Changelog" })
map("n", "<leader>lc", function() LazyVim.news.changelog() end, { desc = "LazyVim Changelog" })
map("n", "<leader>lu", function() lazy.update() end, { desc = "Lazy Update" })
map("n", "<leader>lC", function() lazy.check() end, { desc = "Lazy Check" })
@ -157,9 +156,9 @@ map("x", "#", [[y?\V<C-R>=escape(@", '?\')<CR><CR>]])
-- Dashboard
map("n", "<leader>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" })

2
.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua
View file

@ -1,7 +1,7 @@
return {
{
"Weissle/persistent-breakpoints.nvim",
cond = require("lazyvim.util").has("nvim-dap"),
cond = LazyVim.has("nvim-dap"),
event = "LazyFile",
keys = {
{ "<leader>dbd", "<cmd>PBClearAllBreakpoints<cr>", desc = "Delete All Breakpoints" },

4
.config/nvim/lua/plugins/extras/dap/telescope.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/editor/git/worktree.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/editor/marks/grapple.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/editor/marks/harpoon-extended.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/editor/rest-client.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/editor/telescope/file-browser.lua
View file

@ -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 = {

2
.config/nvim/lua/plugins/extras/editor/telescope/import.lua
View file

@ -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 = {

2
.config/nvim/lua/plugins/extras/editor/telescope/lazy.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/editor/telescope/live-grep.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/editor/telescope/luasnip.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/editor/telescope/media.lua
View file

@ -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 = {

2
.config/nvim/lua/plugins/extras/editor/telescope/repo.lua
View file

@ -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 = {

2
.config/nvim/lua/plugins/extras/editor/telescope/undotree.lua
View file

@ -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 = {

2
.config/nvim/lua/plugins/extras/editor/telescope/workspaces.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/editor/telescope/zoxide.lua
View file

@ -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 = {

2
.config/nvim/lua/plugins/extras/editor/terminal/floaterm.lua
View file

@ -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,

2
.config/nvim/lua/plugins/extras/lazyvim/lualine.lua
View file

@ -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",

55
.config/nvim/lua/plugins/extras/lazyvim/telescope.lua
View file

@ -1,4 +1,3 @@
local Util = require("lazyvim.util")
local actions = require("telescope.actions")
return {
@ -8,39 +7,39 @@ return {
keys = {
{
"<leader>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",
},
{ "<leader>ssc", Util.telescope("lsp_document_symbols", { symbols = { "Class" } }), desc = "Class" },
{ "<leader>ssf", Util.telescope("lsp_document_symbols", { symbols = { "Function" } }), desc = "Function" },
{ "<leader>ssm", Util.telescope("lsp_document_symbols", { symbols = { "Method" } }), desc = "Method" },
{ "<leader>ssC", Util.telescope("lsp_document_symbols", { symbols = { "Constructor" } }), desc = "Constructor" },
{ "<leader>sse", Util.telescope("lsp_document_symbols", { symbols = { "Enum" } }), desc = "Enum" },
{ "<leader>ssi", Util.telescope("lsp_document_symbols", { symbols = { "Interface" } }), desc = "Interface" },
{ "<leader>ssM", Util.telescope("lsp_document_symbols", { symbols = { "Module" } }), desc = "Module" },
{ "<leader>sss", Util.telescope("lsp_document_symbols", { symbols = { "Struct" } }), desc = "Struct" },
{ "<leader>sst", Util.telescope("lsp_document_symbols", { symbols = { "Trait" } }), desc = "Trait" },
{ "<leader>ssF", Util.telescope("lsp_document_symbols", { symbols = { "Field" } }), desc = "Field" },
{ "<leader>ssp", Util.telescope("lsp_document_symbols", { symbols = { "Property" } }), desc = "Property" },
{ "<leader>ssv", Util.telescope("lsp_document_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" },
{ "<leader>ssc", LazyVim.telescope("lsp_document_symbols", { symbols = { "Class" } }), desc = "Class" },
{ "<leader>ssf", LazyVim.telescope("lsp_document_symbols", { symbols = { "Function" } }), desc = "Function" },
{ "<leader>ssm", LazyVim.telescope("lsp_document_symbols", { symbols = { "Method" } }), desc = "Method" },
{ "<leader>ssC", LazyVim.telescope("lsp_document_symbols", { symbols = { "Constructor" } }), desc = "Constructor" },
{ "<leader>sse", LazyVim.telescope("lsp_document_symbols", { symbols = { "Enum" } }), desc = "Enum" },
{ "<leader>ssi", LazyVim.telescope("lsp_document_symbols", { symbols = { "Interface" } }), desc = "Interface" },
{ "<leader>ssM", LazyVim.telescope("lsp_document_symbols", { symbols = { "Module" } }), desc = "Module" },
{ "<leader>sss", LazyVim.telescope("lsp_document_symbols", { symbols = { "Struct" } }), desc = "Struct" },
{ "<leader>sst", LazyVim.telescope("lsp_document_symbols", { symbols = { "Trait" } }), desc = "Trait" },
{ "<leader>ssF", LazyVim.telescope("lsp_document_symbols", { symbols = { "Field" } }), desc = "Field" },
{ "<leader>ssp", LazyVim.telescope("lsp_document_symbols", { symbols = { "Property" } }), desc = "Property" },
{ "<leader>ssv", LazyVim.telescope("lsp_document_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" },
{
"<leader>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",
},
{ "<leader>sSc", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class" } }), desc = "Class" },
{ "<leader>sSf", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Function" } }), desc = "Function" },
{ "<leader>sSm", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Method" } }), desc = "Method" },
{ "<leader>sSC", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Constructor" } }), desc = "Constructor" },
{ "<leader>sSe", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Enum" } }), desc = "Enum" },
{ "<leader>sSi", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Interface" } }), desc = "Interface" },
{ "<leader>sSM", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Module" } }), desc = "Module" },
{ "<leader>sSs", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Struct" } }), desc = "Struct" },
{ "<leader>sSt", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Trait" } }), desc = "Trait" },
{ "<leader>sSF", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Field" } }), desc = "Field" },
{ "<leader>sSp", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Property" } }), desc = "Property" },
{ "<leader>sSv", Util.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" },
{ "<leader>sA", Util.telescope("treesitter"), desc = "Treesitter Symbols" },
{ "<leader>sSc", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Class" } }), desc = "Class" },
{ "<leader>sSf", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Function" } }), desc = "Function" },
{ "<leader>sSm", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Method" } }), desc = "Method" },
{ "<leader>sSC", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Constructor" } }), desc = "Constructor" },
{ "<leader>sSe", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Enum" } }), desc = "Enum" },
{ "<leader>sSi", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Interface" } }), desc = "Interface" },
{ "<leader>sSM", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Module" } }), desc = "Module" },
{ "<leader>sSs", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Struct" } }), desc = "Struct" },
{ "<leader>sSt", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Trait" } }), desc = "Trait" },
{ "<leader>sSF", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Field" } }), desc = "Field" },
{ "<leader>sSp", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Property" } }), desc = "Property" },
{ "<leader>sSv", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" },
{ "<leader>sA", LazyVim.telescope("treesitter"), desc = "Treesitter Symbols" },
{ "<leader>gf", "<cmd>Telescope git_bcommits<cr>", desc = "File History" },
{ "<leader>gS", "<cmd>Telescope git_stash<cr>", desc = "stash" },
{ "<leader>gb", "<cmd>Telescope git_branches<cr>", desc = "branches" },

5
.config/nvim/lua/plugins/extras/ui/zen-mode.lua
View file

@ -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,