From 0253353b083cdf45f69f56c48430751fbce14e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Sat, 1 Jun 2024 22:09:26 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=81=20files(nvim):=20move=20lazyvim=20?= =?UTF-8?q?extras=20and=20extended=20plugins?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/nvim/lazy-lock.json | 4 --- .config/nvim/lazyvim.json | 35 ++++++++++--------- .../cmp.lua => coding/cmp-extended.lua} | 0 .../flash.lua => editor/flash-extended.lua} | 0 .../gitsigns-extended.lua} | 0 .../neo-tree-extended.lua} | 0 .../spectre-extended.lua} | 0 .../telescope/telescope-extended.lua} | 0 .../extras/editor/trouble-extended.lua | 25 +++++++++++++ .../lspconfig-extended.lua} | 0 .../mason.lua => lsp/mason-extended.lua} | 0 .../bufferline-extended.lua} | 0 .../dashboard-extended.lua} | 0 .../lualine.lua => ui/lualine-extended.lua} | 0 .../noice.lua => ui/noice-extended.lua} | 0 .../nvim-notify-extended.lua} | 0 .../which-key-extended.lua} | 0 .../persistence-extended.lua} | 0 .../extras.lua} | 2 +- .../included.lua} | 0 20 files changed, 44 insertions(+), 22 deletions(-) rename .config/nvim/lua/plugins/extras/{lazyvim/cmp.lua => coding/cmp-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/flash.lua => editor/flash-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/gitsigns.lua => editor/gitsigns-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/neo-tree.lua => editor/neo-tree-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/spectre.lua => editor/spectre-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/telescope.lua => editor/telescope/telescope-extended.lua} (100%) create mode 100644 .config/nvim/lua/plugins/extras/editor/trouble-extended.lua rename .config/nvim/lua/plugins/extras/{lazyvim/lspconfig.lua => lsp/lspconfig-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/mason.lua => lsp/mason-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/bufferline.lua => ui/bufferline-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/dashboard.lua => ui/dashboard-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/lualine.lua => ui/lualine-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/noice.lua => ui/noice-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/nvim-notify.lua => ui/nvim-notify-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/which-key.lua => ui/which-key-extended.lua} (100%) rename .config/nvim/lua/plugins/extras/{lazyvim/persistence.lua => util/persistence-extended.lua} (100%) rename .config/nvim/lua/plugins/{lazyvim-extras.lua => lazyvim/extras.lua} (97%) rename .config/nvim/lua/plugins/{lazyvim-included.lua => lazyvim/included.lua} (100%) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 7a442b32..3423a151 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -35,7 +35,6 @@ "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "kitty-scrollback.nvim": { "branch": "main", "commit": "3b0eba29a82f703c44093a91d0ccdc523dabe298" }, "lazy.nvim": { "branch": "main", "commit": "ad30030b6abca7dac5a493c58b4d183b3fe93202" }, - "log-highlight.nvim": { "branch": "main", "commit": "c18d1fd20c411f9fd9702d6d0d09edf3faa2bb96" }, "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -44,7 +43,6 @@ "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, "mini.ai": { "branch": "main", "commit": "7859b6344f5cee567a94f173859d25e20ba1a77e" }, - "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" }, "mini.move": { "branch": "main", "commit": "9670fe1d19af3d9a69ddce920c527c883ca5dc4c" }, "mini.pairs": { "branch": "main", "commit": "40261dfcec7623cd57be3c3beb50fa73f2650cdf" }, "multicursors.nvim": { "branch": "main", "commit": "b959ad0f38881e81e757208c6adfc9e6dc24dfc7" }, @@ -52,7 +50,6 @@ "neoconf.nvim": { "branch": "main", "commit": "f1fd38d61d11f3b1b3e7dc75dc667f79cf2fa58b" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" }, - "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, "noice.nvim": { "branch": "main", "commit": "69c6ad5c1f1c0777125d0275f9871d8609cb0521" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, @@ -76,7 +73,6 @@ "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "fd41b7ccc5490a3a99c734d1ee418b68d06c48a9" }, "nvim-ts-autotag": { "branch": "main", "commit": "bcf3146864262ef2d3c877beba3e222b5c73780d" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-various-textobjs": { "branch": "main", "commit": "5c628394b57dd960c2bf82dcdcf1f4e0d27f2347" }, "nvim-vtsls": { "branch": "main", "commit": "719fabc328c48fa03b1f3373205fcd1f60d21dc2" }, "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 57fca0c3..294825a0 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -7,6 +7,7 @@ "plugins.extras.coding.ai.codeium", "plugins.extras.coding.ai.gen", "plugins.extras.coding.annotation", + "plugins.extras.coding.cmp-extended", "plugins.extras.coding.multicursor", "plugins.extras.coding.recorder", "plugins.extras.coding.refactoring", @@ -22,15 +23,21 @@ "plugins.extras.editor.docs.devdocs", "plugins.extras.editor.docs.obsidian", "plugins.extras.editor.five-server", + "plugins.extras.editor.flash-extended", "plugins.extras.editor.git.diffview", + "plugins.extras.editor.gitsigns-extended", "plugins.extras.editor.marks.grapple", + "plugins.extras.editor.neo-tree-extended", "plugins.extras.editor.package-info", "plugins.extras.editor.search-replace", + "plugins.extras.editor.spectre-extended", "plugins.extras.editor.suda", "plugins.extras.editor.telescope.lazy", + "plugins.extras.editor.telescope.telescope-extended", "plugins.extras.editor.telescope.undotree", "plugins.extras.editor.telescope.zoxide", "plugins.extras.editor.terminal.floaterm", + "plugins.extras.editor.trouble-extended", "plugins.extras.formatting.prettier-extended", "plugins.extras.formatting.trim_newlines", "plugins.extras.formatting.trim_whitespace", @@ -41,39 +48,32 @@ "plugins.extras.lang.web.html-css", "plugins.extras.lang.web.typescript-extended", "plugins.extras.lang.yaml-extended", - "plugins.extras.lazyvim.bufferline", - "plugins.extras.lazyvim.cmp", - "plugins.extras.lazyvim.dashboard", - "plugins.extras.lazyvim.flash", - "plugins.extras.lazyvim.gitsigns", - "plugins.extras.lazyvim.lspconfig", - "plugins.extras.lazyvim.lualine", - "plugins.extras.lazyvim.mason", - "plugins.extras.lazyvim.neo-tree", - "plugins.extras.lazyvim.noice", - "plugins.extras.lazyvim.nvim-notify", - "plugins.extras.lazyvim.persistence", - "plugins.extras.lazyvim.spectre", - "plugins.extras.lazyvim.telescope", - "plugins.extras.lazyvim.trouble", - "plugins.extras.lazyvim.which-key", "plugins.extras.linting.eslint-extended", "plugins.extras.lsp.actions-preview", "plugins.extras.lsp.file-operations", "plugins.extras.lsp.garbage-day", "plugins.extras.lsp.glance", "plugins.extras.lsp.lens", + "plugins.extras.lsp.lspconfig-extended", + "plugins.extras.lsp.mason-extended", + "plugins.extras.ui.bufferline-extended", "plugins.extras.ui.colorschemes.catppuccin", "plugins.extras.ui.context", + "plugins.extras.ui.dashboard-extended", "plugins.extras.ui.highlight-colors", + "plugins.extras.ui.lualine-extended", + "plugins.extras.ui.noice-extended", + "plugins.extras.ui.nvim-notify-extended", "plugins.extras.ui.rainbow-delimeters", "plugins.extras.ui.smooth-scrolling", "plugins.extras.ui.tiny-devicons-auto-colors", + "plugins.extras.ui.which-key-extended", "plugins.extras.util.bigfile", "plugins.extras.util.icon-picker", "plugins.extras.util.kitty-scrollback", "plugins.extras.util.mason-lock", "plugins.extras.util.neovide", + "plugins.extras.util.persistence-extended", "plugins.extras.util.smart-splits", "plugins.extras.util.vscode", "plugins.extras.util.wakatime" @@ -82,4 +82,5 @@ "NEWS.md": "4964" }, "version": 6 -} \ No newline at end of file +} + diff --git a/.config/nvim/lua/plugins/extras/lazyvim/cmp.lua b/.config/nvim/lua/plugins/extras/coding/cmp-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/cmp.lua rename to .config/nvim/lua/plugins/extras/coding/cmp-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/flash.lua b/.config/nvim/lua/plugins/extras/editor/flash-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/flash.lua rename to .config/nvim/lua/plugins/extras/editor/flash-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/gitsigns.lua b/.config/nvim/lua/plugins/extras/editor/gitsigns-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/gitsigns.lua rename to .config/nvim/lua/plugins/extras/editor/gitsigns-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/neo-tree.lua b/.config/nvim/lua/plugins/extras/editor/neo-tree-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/neo-tree.lua rename to .config/nvim/lua/plugins/extras/editor/neo-tree-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/spectre.lua b/.config/nvim/lua/plugins/extras/editor/spectre-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/spectre.lua rename to .config/nvim/lua/plugins/extras/editor/spectre-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/telescope.lua b/.config/nvim/lua/plugins/extras/editor/telescope/telescope-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/telescope.lua rename to .config/nvim/lua/plugins/extras/editor/telescope/telescope-extended.lua diff --git a/.config/nvim/lua/plugins/extras/editor/trouble-extended.lua b/.config/nvim/lua/plugins/extras/editor/trouble-extended.lua new file mode 100644 index 00000000..f9afd179 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/editor/trouble-extended.lua @@ -0,0 +1,25 @@ +return { + "folke/trouble.nvim", + opts = { + auto_close = true, + focus = true, + keys = { + e = "jump", + l = "fold_open", + L = "fold_open_recursive", + h = "fold_close", + H = "fold_close_recursive", + }, + modes = { + test = { + mode = "diagnostics", + preview = { + type = "split", + relative = "win", + position = "right", + size = 0.3, + }, + }, + }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua b/.config/nvim/lua/plugins/extras/lsp/lspconfig-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/lspconfig.lua rename to .config/nvim/lua/plugins/extras/lsp/lspconfig-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/mason.lua b/.config/nvim/lua/plugins/extras/lsp/mason-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/mason.lua rename to .config/nvim/lua/plugins/extras/lsp/mason-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/bufferline.lua b/.config/nvim/lua/plugins/extras/ui/bufferline-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/bufferline.lua rename to .config/nvim/lua/plugins/extras/ui/bufferline-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/dashboard.lua b/.config/nvim/lua/plugins/extras/ui/dashboard-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/dashboard.lua rename to .config/nvim/lua/plugins/extras/ui/dashboard-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/lualine.lua b/.config/nvim/lua/plugins/extras/ui/lualine-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/lualine.lua rename to .config/nvim/lua/plugins/extras/ui/lualine-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/noice.lua b/.config/nvim/lua/plugins/extras/ui/noice-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/noice.lua rename to .config/nvim/lua/plugins/extras/ui/noice-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/nvim-notify.lua b/.config/nvim/lua/plugins/extras/ui/nvim-notify-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/nvim-notify.lua rename to .config/nvim/lua/plugins/extras/ui/nvim-notify-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/which-key.lua b/.config/nvim/lua/plugins/extras/ui/which-key-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/which-key.lua rename to .config/nvim/lua/plugins/extras/ui/which-key-extended.lua diff --git a/.config/nvim/lua/plugins/extras/lazyvim/persistence.lua b/.config/nvim/lua/plugins/extras/util/persistence-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/lazyvim/persistence.lua rename to .config/nvim/lua/plugins/extras/util/persistence-extended.lua diff --git a/.config/nvim/lua/plugins/lazyvim-extras.lua b/.config/nvim/lua/plugins/lazyvim/extras.lua similarity index 97% rename from .config/nvim/lua/plugins/lazyvim-extras.lua rename to .config/nvim/lua/plugins/lazyvim/extras.lua index 71f853db..253fc5a4 100644 --- a/.config/nvim/lua/plugins/lazyvim-extras.lua +++ b/.config/nvim/lua/plugins/lazyvim/extras.lua @@ -5,7 +5,7 @@ return { { "tzachar/cmp-tabnine", optional = true }, { "Exafunction/codeium.nvim", optional = true }, { "echasnovski/mini.surround", optional = true }, - { "JoosepAlviste/nvim-ts-context-commentstring" }, + { "JoosepAlviste/nvim-ts-context-commentstring", optional = true }, -- DAP { "jbyuki/one-small-step-for-vimkind", optional = true }, diff --git a/.config/nvim/lua/plugins/lazyvim-included.lua b/.config/nvim/lua/plugins/lazyvim/included.lua similarity index 100% rename from .config/nvim/lua/plugins/lazyvim-included.lua rename to .config/nvim/lua/plugins/lazyvim/included.lua