From e457722492d7aa77d1ee753898f757bbcd2dcc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Wed, 25 Oct 2023 12:38:42 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=81=20files(nvim):=20changes=20to=20th?= =?UTF-8?q?e=20directories=20and=20extras?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit another bug change to the structure of the nvim config. probably, tomorrow will be finished --- .config/nvim/lazy-lock.json | 7 +- .config/nvim/lazyvim.json | 58 ++++++++-------- .../nvim/lua/plugins/extras/ai/codeium.lua | 31 +++++++++ .../nvim/lua/plugins/extras/ai/copilot.lua | 23 +++++++ .../lua/plugins/extras/{ai.lua => ai/gpt.lua} | 54 --------------- .config/nvim/lua/plugins/extras/alpha.lua | 56 ---------------- .../lua/plugins/extras/{ => coding}/cmp.lua | 0 .../documentation.lua} | 45 +++++++++++++ .../lua/plugins/extras/coding/multicursor.lua | 17 +++++ .../lua/plugins/extras/coding/refactoring.lua | 19 ++++++ .../extras/{ => coding}/rest-client.lua | 0 .config/nvim/lua/plugins/extras/color.lua | 18 ----- .../extras/dap/persistent-breakpoints.lua | 12 ++++ .config/nvim/lua/plugins/extras/debug.lua | 14 ---- .../nvim/lua/plugins/extras/documentation.lua | 47 ------------- .../extras/{ => editor}/breadcrumbs.lua | 4 +- .../nvim/lua/plugins/extras/editor/color.lua | 16 +++++ .../lua/plugins/extras/{ => editor}/git.lua | 28 ++++++++ .../plugins/extras/{ => editor}/github.lua | 1 - .../plugins/extras/{ => editor}/harpoon.lua | 26 ++++---- .../lua/plugins/extras/{ => lang}/ansible.lua | 0 .../nvim/lua/plugins/extras/{ => lang}/db.lua | 0 .../plugins/extras/{ => lang}/markdown.lua | 0 .../lua/plugins/extras/{ => lang}/php.lua | 0 .../lua/plugins/extras/{ => lang}/semshi.lua | 0 .../lua/plugins/extras/{ => lang}/web.lua | 0 .../lua/plugins/extras/{ => lsp}/compiler.lua | 0 .../nvim/lua/plugins/extras/{ => lsp}/lsp.lua | 8 +++ .../lua/plugins/extras/{ => lsp}/repl.lua | 0 .../nvim/lua/plugins/extras/multicursor.lua | 19 ------ .config/nvim/lua/plugins/extras/refactor.lua | 20 ------ .../extras/{ => test}/test-extended.lua | 0 .config/nvim/lua/plugins/extras/ui/alpha.lua | 66 +++++++++++++++++++ .../nvim/lua/plugins/extras/{ => ui}/fold.lua | 0 .../extras/{ => ui}/rainbow-delimeters.lua | 0 .../lua/plugins/extras/{ => ui}/scrollbar.lua | 0 .../plugins/extras/{ => ui}/ui-extended.lua | 0 .../lua/plugins/extras/{ => ui}/zen-mode.lua | 0 .../plugins/extras/{ => util}/discordrcp.lua | 0 .../lua/plugins/extras/{ => util}/image.lua | 0 .../extras/{ => util}/smooth-scrolling.lua | 0 .../lua/plugins/extras/{ => util}/util.lua | 6 ++ .config/nvim/lua/plugins/telescope.lua | 24 ------- .config/nvim/lua/plugins/treesitter.lua | 1 - 44 files changed, 321 insertions(+), 299 deletions(-) create mode 100644 .config/nvim/lua/plugins/extras/ai/codeium.lua create mode 100644 .config/nvim/lua/plugins/extras/ai/copilot.lua rename .config/nvim/lua/plugins/extras/{ai.lua => ai/gpt.lua} (72%) delete mode 100644 .config/nvim/lua/plugins/extras/alpha.lua rename .config/nvim/lua/plugins/extras/{ => coding}/cmp.lua (100%) rename .config/nvim/lua/plugins/extras/{annotation.lua => coding/documentation.lua} (57%) create mode 100644 .config/nvim/lua/plugins/extras/coding/multicursor.lua create mode 100644 .config/nvim/lua/plugins/extras/coding/refactoring.lua rename .config/nvim/lua/plugins/extras/{ => coding}/rest-client.lua (100%) delete mode 100644 .config/nvim/lua/plugins/extras/color.lua create mode 100644 .config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua delete mode 100644 .config/nvim/lua/plugins/extras/debug.lua delete mode 100644 .config/nvim/lua/plugins/extras/documentation.lua rename .config/nvim/lua/plugins/extras/{ => editor}/breadcrumbs.lua (80%) create mode 100644 .config/nvim/lua/plugins/extras/editor/color.lua rename .config/nvim/lua/plugins/extras/{ => editor}/git.lua (59%) rename .config/nvim/lua/plugins/extras/{ => editor}/github.lua (99%) rename .config/nvim/lua/plugins/extras/{ => editor}/harpoon.lua (69%) rename .config/nvim/lua/plugins/extras/{ => lang}/ansible.lua (100%) rename .config/nvim/lua/plugins/extras/{ => lang}/db.lua (100%) rename .config/nvim/lua/plugins/extras/{ => lang}/markdown.lua (100%) rename .config/nvim/lua/plugins/extras/{ => lang}/php.lua (100%) rename .config/nvim/lua/plugins/extras/{ => lang}/semshi.lua (100%) rename .config/nvim/lua/plugins/extras/{ => lang}/web.lua (100%) rename .config/nvim/lua/plugins/extras/{ => lsp}/compiler.lua (100%) rename .config/nvim/lua/plugins/extras/{ => lsp}/lsp.lua (97%) rename .config/nvim/lua/plugins/extras/{ => lsp}/repl.lua (100%) delete mode 100644 .config/nvim/lua/plugins/extras/multicursor.lua delete mode 100644 .config/nvim/lua/plugins/extras/refactor.lua rename .config/nvim/lua/plugins/extras/{ => test}/test-extended.lua (100%) create mode 100644 .config/nvim/lua/plugins/extras/ui/alpha.lua rename .config/nvim/lua/plugins/extras/{ => ui}/fold.lua (100%) rename .config/nvim/lua/plugins/extras/{ => ui}/rainbow-delimeters.lua (100%) rename .config/nvim/lua/plugins/extras/{ => ui}/scrollbar.lua (100%) rename .config/nvim/lua/plugins/extras/{ => ui}/ui-extended.lua (100%) rename .config/nvim/lua/plugins/extras/{ => ui}/zen-mode.lua (100%) rename .config/nvim/lua/plugins/extras/{ => util}/discordrcp.lua (100%) rename .config/nvim/lua/plugins/extras/{ => util}/image.lua (100%) rename .config/nvim/lua/plugins/extras/{ => util}/smooth-scrolling.lua (100%) rename .config/nvim/lua/plugins/extras/{ => util}/util.lua (98%) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 8efcc058..344ee93c 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -72,7 +72,7 @@ "noice.nvim": { "branch": "main", "commit": "50fc77bcd75cf32374521fb227e9f41f3fe1521a" }, "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, - "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" }, + "nvim-cmp": { "branch": "main", "commit": "51260c02a8ffded8e16162dcf41a23ec90cfba62" }, "nvim-cmp-fonts": { "branch": "master", "commit": "43be83eb24ff8aec124c3aae64d053a095e03bd0" }, "nvim-dap": { "branch": "master", "commit": "b595c820018a15b6d54bf53b5cbeaa6f2d7a27e2" }, "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" }, @@ -83,14 +83,14 @@ "nvim-jdtls": { "branch": "master", "commit": "a09f8cdd75c546eb024d0f0b5b3ad185f05b738f" }, "nvim-jqx": { "branch": "master", "commit": "11b1d0368e5b23b9c356da8e5f70bb5827f27f62" }, "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" }, - "nvim-lint": { "branch": "master", "commit": "158232735a7f7d9c5de2aadb8bde4d5d67724f13" }, + "nvim-lint": { "branch": "master", "commit": "962a76877a4479a535b935bd7ef35ad41ba308b2" }, "nvim-lspconfig": { "branch": "master", "commit": "6428fcab6f3c09e934bc016c329806314384a41e" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, "nvim-numbertoggle": { "branch": "main", "commit": "9ab95e60ea5ec138e1b2332e0fc18b8e5de464c6" }, "nvim-puppeteer": { "branch": "main", "commit": "b2793ab39120086fa59327d3901a847961198662" }, "nvim-regexplainer": { "branch": "main", "commit": "187f8666c2ba0fcba4ddb991e48d7229b0a58d96" }, "nvim-spectre": { "branch": "master", "commit": "696cff781a4a7ecc91549736835e2acbd00fe859" }, - "nvim-treesitter": { "branch": "master", "commit": "4199be485cd85662d8ff1dc8c4cc78d819fad6cd" }, + "nvim-treesitter": { "branch": "master", "commit": "44762abc90725e279f3b9cfbe4cafb41ea72f09b" }, "nvim-treesitter-context": { "branch": "master", "commit": "8aa32aa6b84dda357849dbc0f775e69f2e04c041" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "eb208bfdfcf76efea0424747e23e44641e13aaa6" }, @@ -136,6 +136,7 @@ "tree-sitter-hypr": { "branch": "master", "commit": "90b3ddf8a85b5ea3d9dc4920fddb16182a192e14" }, "treesj": { "branch": "main", "commit": "070e6761d0b11a55446d988a69908f7a0928dbab" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "tsc.nvim": { "branch": "main", "commit": "26d3c9010f3ef78fbecdfc69d901ab8ed89cff6c" }, "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, "undotree": { "branch": "master", "commit": "3ff3aa02fd3a18d7fc5be9ed3166d36c545707fe" }, "urlview.nvim": { "branch": "main", "commit": "bdbdf1e020e283551f003e71b0004096c746ef57" }, diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 75c4a700..94da60f6 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -23,35 +23,35 @@ "lazyvim.plugins.extras.util.dot", "lazyvim.plugins.extras.util.project", "lazyvim.plugins.extras.vscode", - "plugins.extras.ai", - "plugins.extras.alpha", - "plugins.extras.annotation", - "plugins.extras.breadcrumbs", - "plugins.extras.cmp", - "plugins.extras.color", - "plugins.extras.compiler", - "plugins.extras.db", - "plugins.extras.debug", - "plugins.extras.discordrcp", - "plugins.extras.documentation", - "plugins.extras.git", - "plugins.extras.github", - "plugins.extras.harpoon", - "plugins.extras.lsp", - "plugins.extras.markdown", - "plugins.extras.multicursor", - "plugins.extras.rainbow-delimeters", - "plugins.extras.refactor", - "plugins.extras.repl", - "plugins.extras.rest-client", - "plugins.extras.scrollbar", - "plugins.extras.semshi", - "plugins.extras.smooth-scrolling", - "plugins.extras.test-extended", - "plugins.extras.ui-extended", - "plugins.extras.util", - "plugins.extras.web", - "plugins.extras.zen-mode" + "plugins.extras.ai.codeium", + "plugins.extras.ai.gpt", + "plugins.extras.coding.cmp", + "plugins.extras.coding.documentation", + "plugins.extras.coding.multicursor", + "plugins.extras.coding.refactoring", + "plugins.extras.coding.rest-client", + "plugins.extras.dap.persistent-breakpoints", + "plugins.extras.editor.breadcrumbs", + "plugins.extras.editor.color", + "plugins.extras.editor.git", + "plugins.extras.editor.github", + "plugins.extras.editor.harpoon", + "plugins.extras.lang.db", + "plugins.extras.lang.markdown", + "plugins.extras.lang.semshi", + "plugins.extras.lang.web", + "plugins.extras.lsp.compiler", + "plugins.extras.lsp.lsp", + "plugins.extras.lsp.repl", + "plugins.extras.test.test-extended", + "plugins.extras.ui.alpha", + "plugins.extras.ui.rainbow-delimeters", + "plugins.extras.ui.scrollbar", + "plugins.extras.ui.ui-extended", + "plugins.extras.ui.zen-mode", + "plugins.extras.util.discordrcp", + "plugins.extras.util.smooth-scrolling", + "plugins.extras.util.util" ], "news": { "NEWS.md": "2123" diff --git a/.config/nvim/lua/plugins/extras/ai/codeium.lua b/.config/nvim/lua/plugins/extras/ai/codeium.lua new file mode 100644 index 00000000..4e21978f --- /dev/null +++ b/.config/nvim/lua/plugins/extras/ai/codeium.lua @@ -0,0 +1,31 @@ +return { + "Exafunction/codeium.vim", + event = "BufEnter", + config = function() + vim.g.codeium_disable_bindings = 1 + + vim.keymap.set("i", "", function() + return vim.fn["codeium#Accept"]() + end, { expr = true }) + + vim.keymap.set("i", "", function() + return vim.fn["codeium#CycleCompletions"](1) + end, { expr = true }) + + vim.keymap.set("i", "", function() + return vim.fn["codeium#CycleCompletions"](-1) + end, { expr = true }) + + vim.keymap.set("i", "", function() + return vim.fn["codeium#Clear"]() + end, { expr = true }) + + vim.keymap.set("n", "cI", function() + if vim.g.codeium_enabled == true then + vim.cmd("CodeiumDisable") + else + vim.cmd("CodeiumEnable") + end + end, { noremap = true, desc = "Toggle Codeium" }) + end, +} diff --git a/.config/nvim/lua/plugins/extras/ai/copilot.lua b/.config/nvim/lua/plugins/extras/ai/copilot.lua new file mode 100644 index 00000000..bf875f1b --- /dev/null +++ b/.config/nvim/lua/plugins/extras/ai/copilot.lua @@ -0,0 +1,23 @@ +return { + "zbirenbaum/copilot.lua", + enabled = false, + opts = { + suggestion = { + enabled = true, + auto_trigger = true, + keymap = { + accept = "", + accept_line = "", + accept_word = "", + next = "", + prev = "", + dismiss = "", + }, + }, + panel = { enabled = false }, + filetypes = { + markdown = true, + help = true, + }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/ai.lua b/.config/nvim/lua/plugins/extras/ai/gpt.lua similarity index 72% rename from .config/nvim/lua/plugins/extras/ai.lua rename to .config/nvim/lua/plugins/extras/ai/gpt.lua index 1f5fce32..052cf702 100644 --- a/.config/nvim/lua/plugins/extras/ai.lua +++ b/.config/nvim/lua/plugins/extras/ai/gpt.lua @@ -1,35 +1,4 @@ return { - { - "Exafunction/codeium.vim", - event = "BufEnter", - config = function() - vim.g.codeium_disable_bindings = 1 - - vim.keymap.set("i", "", function() - return vim.fn["codeium#Accept"]() - end, { expr = true }) - - vim.keymap.set("i", "", function() - return vim.fn["codeium#CycleCompletions"](1) - end, { expr = true }) - - vim.keymap.set("i", "", function() - return vim.fn["codeium#CycleCompletions"](-1) - end, { expr = true }) - - vim.keymap.set("i", "", function() - return vim.fn["codeium#Clear"]() - end, { expr = true }) - - vim.keymap.set("n", "cI", function() - if vim.g.codeium_enabled == true then - vim.cmd("CodeiumDisable") - else - vim.cmd("CodeiumEnable") - end - end, { noremap = true, desc = "Toggle Codeium" }) - end, - }, { "jackMort/ChatGPT.nvim", opts = { @@ -130,27 +99,4 @@ return { }, }, }, - { - "zbirenbaum/copilot.lua", - enabled = false, - opts = { - suggestion = { - enabled = true, - auto_trigger = true, - keymap = { - accept = "", - accept_line = "", - accept_word = "", - next = "", - prev = "", - dismiss = "", - }, - }, - panel = { enabled = false }, - filetypes = { - markdown = true, - help = true, - }, - }, - }, } diff --git a/.config/nvim/lua/plugins/extras/alpha.lua b/.config/nvim/lua/plugins/extras/alpha.lua deleted file mode 100644 index 27105af6..00000000 --- a/.config/nvim/lua/plugins/extras/alpha.lua +++ /dev/null @@ -1,56 +0,0 @@ -return { - { - "goolord/alpha-nvim", - event = "VimEnter", - optional = true, - opts = function() - local dashboard = require("alpha.themes.dashboard") - local logo = [[ -  - ███████████ █████ ██ - ███████████ █████  - ████████████████ ███████████ ███ ███████ - ████████████████ ████████████ █████ ██████████████ - ██████████████ █████████████ █████ █████ ████ █████ - ██████████████████████████████████ █████ █████ ████ █████ - ██████ ███ █████████████████ ████ █████ █████ ████ ██████ - ]] - -- local logo = [[ - -- ▄ ▄ - -- ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ - -- █ ▄ █▄█ ▄▄▄ █ █▄█ █ █ - -- ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █ - -- ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - -- █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄ - -- ▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █ - -- █▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █ - -- █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ - -- ]] - - dashboard.section.header.val = vim.split(logo, "\n") - -- stylua: ignore - dashboard.section.buttons.val = { - dashboard.button("f", " " .. " Find file", " Telescope find_files "), - dashboard.button("n", " " .. " New file", " ene startinsert "), - dashboard.button("r", " " .. " Recent files", " Telescope oldfiles "), - dashboard.button("p", " " .. " Projects", "Telescope projects "), - dashboard.button("g", " " .. " Find text", " Telescope live_grep "), - dashboard.button("c", " " .. " Config", " lua require('lazyvim.util').telescope.config_files()() "), - dashboard.button("d", "󰉦 " .. " Dotfiles", "FloatermNew --disposable --name=dots --opener=edit --titleposition=center --height=0.85 --width=0.85 dots"), - dashboard.button("s", " " .. " Restore Session", [[ lua require("persistence").load() ]]), - dashboard.button("e", " " .. " Lazy Extras", " LazyExtras "), - dashboard.button("l", "󰒲 " .. " Lazy", " Lazy "), - dashboard.button("q", " " .. " Quit", " qa "), - } - for _, button in ipairs(dashboard.section.buttons.val) do - button.opts.hl = "AlphaButtons" - button.opts.hl_shortcut = "AlphaShortcut" - end - dashboard.section.header.opts.hl = "AlphaHeader" - dashboard.section.buttons.opts.hl = "AlphaButtons" - dashboard.section.footer.opts.hl = "AlphaFooter" - dashboard.opts.layout[1].val = 8 - return dashboard - end, - }, -} diff --git a/.config/nvim/lua/plugins/extras/cmp.lua b/.config/nvim/lua/plugins/extras/coding/cmp.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/cmp.lua rename to .config/nvim/lua/plugins/extras/coding/cmp.lua diff --git a/.config/nvim/lua/plugins/extras/annotation.lua b/.config/nvim/lua/plugins/extras/coding/documentation.lua similarity index 57% rename from .config/nvim/lua/plugins/extras/annotation.lua rename to .config/nvim/lua/plugins/extras/coding/documentation.lua index b662308f..4bd9a9a7 100644 --- a/.config/nvim/lua/plugins/extras/annotation.lua +++ b/.config/nvim/lua/plugins/extras/coding/documentation.lua @@ -63,4 +63,49 @@ return { }, }, }, + { + "luckasRanarison/nvim-devdocs", + cmd = { + "DevdocsFetch", + "DevdocsInstall", + "DevdocsUninstall", + "DevdocsOpen", + "DevdocsOpenFloat", + "DevdocsOpenCurrent", + "DevdocsOpenCurrentFloat", + "DevdocsUpdate", + "DevdocsUpdateAll", + }, + keys = { + { "sE", "DevdocsOpen", desc = "Devdocs" }, + { "se", "DevdocsOpenCurrent", desc = "Devdocs Current" }, + }, + opts = { + ensure_installed = { + "css", + "html", + "javascript", + "lua-5.4", + "python-3.11", + "react", + "typescript", + "angular", + "bash", + "fish-3.6", + "git", + "go", + "rust", + "sass", + "vue-3", + "docker", + "markdown", + "svelte", + "tailwindcss", + "eslint", + "prettier", + "npm", + "node", + }, + }, + }, } diff --git a/.config/nvim/lua/plugins/extras/coding/multicursor.lua b/.config/nvim/lua/plugins/extras/coding/multicursor.lua new file mode 100644 index 00000000..f343f4f5 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/coding/multicursor.lua @@ -0,0 +1,17 @@ +return { + "smoka7/multicursors.nvim", + dependencies = { + "nvim-treesitter/nvim-treesitter", + "smoka7/hydra.nvim", + }, + cmd = { "MCstart", "MCvisual", "MCclear", "MCpattern", "MCvisualPattern", "MCunderCursor" }, + keys = { + { + mode = { "v", "n" }, + "m", + "MCstart", + desc = "Create a selection for selected text or word under the cursor", + }, + }, + config = true, +} diff --git a/.config/nvim/lua/plugins/extras/coding/refactoring.lua b/.config/nvim/lua/plugins/extras/coding/refactoring.lua new file mode 100644 index 00000000..dce60c18 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/coding/refactoring.lua @@ -0,0 +1,19 @@ +local Util = require("lazyvim.util") + +return { + "ThePrimeagen/refactoring.nvim", + requires = { + { "nvim-lua/plenary.nvim" }, + { "nvim-treesitter/nvim-treesitter" }, + }, + opts = {}, + config = function(_, opts) + Util.on_load("telescope.nvim", function() + require("telescope").load_extension("refactoring") + end) + end, + -- stylua: ignore + keys = { + { "r", function() require('telescope').extensions.refactoring.refactors() end, mode = { "n", "x" }, desc = "Refactor" }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/rest-client.lua b/.config/nvim/lua/plugins/extras/coding/rest-client.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/rest-client.lua rename to .config/nvim/lua/plugins/extras/coding/rest-client.lua diff --git a/.config/nvim/lua/plugins/extras/color.lua b/.config/nvim/lua/plugins/extras/color.lua deleted file mode 100644 index a1d76a3e..00000000 --- a/.config/nvim/lua/plugins/extras/color.lua +++ /dev/null @@ -1,18 +0,0 @@ -return { - { - "uga-rosa/ccc.nvim", - event = { "BufRead" }, - cmd = { "CccPick", "CccConvert", "CccHighlighterEnable", "CccHighlighterDisable", "CccHighlighterToggle" }, - keys = { - { "uC", "CccHighlighterToggle", desc = "Toggle Colorizer" }, - { "", "CccConvert", desc = "Convert color" }, - { "", "CccPick", desc = "Pick Color" }, - }, - opts = { - highlighter = { - auto_enable = true, - lsp = true, - }, - }, - }, -} diff --git a/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua b/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua new file mode 100644 index 00000000..23eff00e --- /dev/null +++ b/.config/nvim/lua/plugins/extras/dap/persistent-breakpoints.lua @@ -0,0 +1,12 @@ +return { + "Weissle/persistent-breakpoints.nvim", + event = "BufReadPost", + keys = { + { "dd", "PBClearAllBreakpoints", desc = "Delete All Breakpoints" }, + { "dB", "PBSetConditionalBreakpoint", desc = "Breakpoint Condition" }, + { "db", "PBToggleBreakpoint", desc = "Toggle Breakpoint" }, + }, + opts = { + load_breakpoints_event = { "BufReadPost" }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/debug.lua b/.config/nvim/lua/plugins/extras/debug.lua deleted file mode 100644 index e458b663..00000000 --- a/.config/nvim/lua/plugins/extras/debug.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - { - "Weissle/persistent-breakpoints.nvim", - event = "BufReadPost", - keys = { - { "dd", "PBClearAllBreakpoints", desc = "Delete All Breakpoints" }, - { "dB", "PBSetConditionalBreakpoint", desc = "Breakpoint Condition" }, - { "db", "PBToggleBreakpoint", desc = "Toggle Breakpoint" }, - }, - opts = { - load_breakpoints_event = { "BufReadPost" }, - }, - }, -} diff --git a/.config/nvim/lua/plugins/extras/documentation.lua b/.config/nvim/lua/plugins/extras/documentation.lua deleted file mode 100644 index 20aa549f..00000000 --- a/.config/nvim/lua/plugins/extras/documentation.lua +++ /dev/null @@ -1,47 +0,0 @@ -return { - { - "luckasRanarison/nvim-devdocs", - cmd = { - "DevdocsFetch", - "DevdocsInstall", - "DevdocsUninstall", - "DevdocsOpen", - "DevdocsOpenFloat", - "DevdocsOpenCurrent", - "DevdocsOpenCurrentFloat", - "DevdocsUpdate", - "DevdocsUpdateAll", - }, - keys = { - { "sE", "DevdocsOpen", desc = "Devdocs" }, - { "se", "DevdocsOpenCurrent", desc = "Devdocs Current" }, - }, - opts = { - ensure_installed = { - "css", - "html", - "javascript", - "lua-5.4", - "python-3.11", - "react", - "typescript", - "angular", - "bash", - "fish-3.6", - "git", - "go", - "rust", - "sass", - "vue-3", - "docker", - "markdown", - "svelte", - "tailwindcss", - "eslint", - "prettier", - "npm", - "node", - }, - }, - }, -} diff --git a/.config/nvim/lua/plugins/extras/breadcrumbs.lua b/.config/nvim/lua/plugins/extras/editor/breadcrumbs.lua similarity index 80% rename from .config/nvim/lua/plugins/extras/breadcrumbs.lua rename to .config/nvim/lua/plugins/extras/editor/breadcrumbs.lua index 8e0a7452..f872c423 100644 --- a/.config/nvim/lua/plugins/extras/breadcrumbs.lua +++ b/.config/nvim/lua/plugins/extras/editor/breadcrumbs.lua @@ -1,6 +1,6 @@ return { { - "Bekaboo/dropbar.nvim", + "Bekaboo/dropbar.nvim", -- NOTE: NVIM >= 10.0 event = "BufRead", opts = { sources = { @@ -11,7 +11,7 @@ return { }, }, { - "utilyre/barbecue.nvim", + "utilyre/barbecue.nvim", -- NOTE: NVIM < 10.0 name = "barbecue", version = "*", dependencies = { diff --git a/.config/nvim/lua/plugins/extras/editor/color.lua b/.config/nvim/lua/plugins/extras/editor/color.lua new file mode 100644 index 00000000..1d88bc36 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/editor/color.lua @@ -0,0 +1,16 @@ +return { + "uga-rosa/ccc.nvim", + event = { "BufRead" }, + cmd = { "CccPick", "CccConvert", "CccHighlighterEnable", "CccHighlighterDisable", "CccHighlighterToggle" }, + keys = { + { "uC", "CccHighlighterToggle", desc = "Toggle Colorizer" }, + { "", "CccConvert", desc = "Convert color" }, + { "", "CccPick", desc = "Pick Color" }, + }, + opts = { + highlighter = { + auto_enable = true, + lsp = true, + }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/git.lua b/.config/nvim/lua/plugins/extras/editor/git.lua similarity index 59% rename from .config/nvim/lua/plugins/extras/git.lua rename to .config/nvim/lua/plugins/extras/editor/git.lua index 082bdb94..efa6e572 100644 --- a/.config/nvim/lua/plugins/extras/git.lua +++ b/.config/nvim/lua/plugins/extras/editor/git.lua @@ -1,3 +1,5 @@ +local Util = require("lazyvim.util") + return { { "sindrets/diffview.nvim", @@ -20,6 +22,32 @@ return { { "]g", "GitConflictPrevConflict", desc = "Next Git Conflict" }, }, }, + { + "ThePrimeagen/git-worktree.nvim", + opts = {}, + config = function(_, opts) + Util.on_load("telescope.nvim", function() + require("telescope").load_extension("git_worktree") + end) + end, + 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", + }, + }, + }, + { "folke/which-key.nvim", opts = { diff --git a/.config/nvim/lua/plugins/extras/github.lua b/.config/nvim/lua/plugins/extras/editor/github.lua similarity index 99% rename from .config/nvim/lua/plugins/extras/github.lua rename to .config/nvim/lua/plugins/extras/editor/github.lua index 3db7e2b0..4780eec7 100644 --- a/.config/nvim/lua/plugins/extras/github.lua +++ b/.config/nvim/lua/plugins/extras/editor/github.lua @@ -1,5 +1,4 @@ local prefix = "G" -local icon = vim.g.icons_enabled and " " or "" return { { "almo7aya/openingh.nvim", diff --git a/.config/nvim/lua/plugins/extras/harpoon.lua b/.config/nvim/lua/plugins/extras/editor/harpoon.lua similarity index 69% rename from .config/nvim/lua/plugins/extras/harpoon.lua rename to .config/nvim/lua/plugins/extras/editor/harpoon.lua index cf06cf38..c37c431e 100644 --- a/.config/nvim/lua/plugins/extras/harpoon.lua +++ b/.config/nvim/lua/plugins/extras/editor/harpoon.lua @@ -1,6 +1,8 @@ +local Util = require("lazyvim.util") + return { - { - "ThePrimeagen/harpoon", + { + "ThePrimeagen/harpoon", --stylua: ignore keys = { { "'", function() require("harpoon.mark").add_file() end, desc = "Add File" }, @@ -12,14 +14,16 @@ return { { "5", function() require("harpoon.ui").nav_file(5) end, desc = "File 5" }, { "6", function() require("harpoon.ui").nav_file(6) end, desc = "File 6" }, }, - opts = { - globalsettings = { - save_on_toggle = true, - enter_on_sendcmd = true, - }, - }, - setup = function() - require("telescope").load_extension("harpoon") - end, + opts = { + globalsettings = { + save_on_toggle = true, + enter_on_sendcmd = true, + }, }, + config = function() + Util.on_load("telescope.nvim", function() + require("telescope").load_extension("harpoon") + end) + end, + }, } diff --git a/.config/nvim/lua/plugins/extras/ansible.lua b/.config/nvim/lua/plugins/extras/lang/ansible.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/ansible.lua rename to .config/nvim/lua/plugins/extras/lang/ansible.lua diff --git a/.config/nvim/lua/plugins/extras/db.lua b/.config/nvim/lua/plugins/extras/lang/db.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/db.lua rename to .config/nvim/lua/plugins/extras/lang/db.lua diff --git a/.config/nvim/lua/plugins/extras/markdown.lua b/.config/nvim/lua/plugins/extras/lang/markdown.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/markdown.lua rename to .config/nvim/lua/plugins/extras/lang/markdown.lua diff --git a/.config/nvim/lua/plugins/extras/php.lua b/.config/nvim/lua/plugins/extras/lang/php.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/php.lua rename to .config/nvim/lua/plugins/extras/lang/php.lua diff --git a/.config/nvim/lua/plugins/extras/semshi.lua b/.config/nvim/lua/plugins/extras/lang/semshi.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/semshi.lua rename to .config/nvim/lua/plugins/extras/lang/semshi.lua diff --git a/.config/nvim/lua/plugins/extras/web.lua b/.config/nvim/lua/plugins/extras/lang/web.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/web.lua rename to .config/nvim/lua/plugins/extras/lang/web.lua diff --git a/.config/nvim/lua/plugins/extras/compiler.lua b/.config/nvim/lua/plugins/extras/lsp/compiler.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/compiler.lua rename to .config/nvim/lua/plugins/extras/lsp/compiler.lua diff --git a/.config/nvim/lua/plugins/extras/lsp.lua b/.config/nvim/lua/plugins/extras/lsp/lsp.lua similarity index 97% rename from .config/nvim/lua/plugins/extras/lsp.lua rename to .config/nvim/lua/plugins/extras/lsp/lsp.lua index 73efce97..fa1f9386 100644 --- a/.config/nvim/lua/plugins/extras/lsp.lua +++ b/.config/nvim/lua/plugins/extras/lsp/lsp.lua @@ -212,4 +212,12 @@ return { { "ue", "LspLensToggle", desc = "Toggle Lsp Lens" }, }, }, + { + "dmmulroy/tsc.nvim", + config = true, + cmd = "TSC", + keys = { + { "ct", "TSC", desc = "Type Check" }, + }, + }, } diff --git a/.config/nvim/lua/plugins/extras/repl.lua b/.config/nvim/lua/plugins/extras/lsp/repl.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/repl.lua rename to .config/nvim/lua/plugins/extras/lsp/repl.lua diff --git a/.config/nvim/lua/plugins/extras/multicursor.lua b/.config/nvim/lua/plugins/extras/multicursor.lua deleted file mode 100644 index cc4295fa..00000000 --- a/.config/nvim/lua/plugins/extras/multicursor.lua +++ /dev/null @@ -1,19 +0,0 @@ -return { - { - "smoka7/multicursors.nvim", - dependencies = { - "nvim-treesitter/nvim-treesitter", - "smoka7/hydra.nvim", - }, - cmd = { "MCstart", "MCvisual", "MCclear", "MCpattern", "MCvisualPattern", "MCunderCursor" }, - keys = { - { - mode = { "v", "n" }, - "m", - "MCstart", - desc = "Create a selection for selected text or word under the cursor", - }, - }, - config = true, - }, -} diff --git a/.config/nvim/lua/plugins/extras/refactor.lua b/.config/nvim/lua/plugins/extras/refactor.lua deleted file mode 100644 index 3f57eb51..00000000 --- a/.config/nvim/lua/plugins/extras/refactor.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - { - "ThePrimeagen/refactoring.nvim", - requires = { - { "nvim-lua/plenary.nvim" }, - { "nvim-treesitter/nvim-treesitter" }, - }, - opts = {}, - -- stylua: ignore - keys = { - { "r", function() require('telescope').extensions.refactoring.refactors() end, mode = { "n", "x" }, desc = "Refactor" }, - }, - }, - { - "nvim-telescope/telescope.nvim", - opts = function(_, opts) - require("telescope").load_extension("refactoring") - end, - }, -} diff --git a/.config/nvim/lua/plugins/extras/test-extended.lua b/.config/nvim/lua/plugins/extras/test/test-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/test-extended.lua rename to .config/nvim/lua/plugins/extras/test/test-extended.lua diff --git a/.config/nvim/lua/plugins/extras/ui/alpha.lua b/.config/nvim/lua/plugins/extras/ui/alpha.lua new file mode 100644 index 00000000..fc0cacd4 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/ui/alpha.lua @@ -0,0 +1,66 @@ +return { + { + "goolord/alpha-nvim", + event = "VimEnter", + optional = true, + opts = function() + local dashboard = require("alpha.themes.dashboard") + local logo = [[ +  + ████ ██████ █████ ██ + ███████████ █████  + █████████ ███████████████████ ███ ███████████ + █████████ ███ █████████████ █████ ██████████████ + █████████ ██████████ █████████ █████ █████ ████ █████ + ███████████ ███ ███ █████████ █████ █████ ████ █████ +██████ █████████████████████ ████ █████ █████ ████ ██████ + ]] + -- local logo = [[ + --  + -- ███████████ █████ ██ + -- ███████████ █████  + -- ████████████████ ███████████ ███ ███████ + -- ████████████████ ████████████ █████ ██████████████ + -- ██████████████ █████████████ █████ █████ ████ █████ + -- ██████████████████████████████████ █████ █████ ████ █████ + -- ██████ ███ █████████████████ ████ █████ █████ ████ ██████ + -- ]] + -- local logo = [[ + -- ▄ ▄ + -- ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ + -- █ ▄ █▄█ ▄▄▄ █ █▄█ █ █ + -- ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █ + -- ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + -- █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄ + -- ▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █ + -- █▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █ + -- █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ + -- ]] + + dashboard.section.header.val = vim.split(logo, "\n") + -- stylua: ignore + dashboard.section.buttons.val = { + dashboard.button("f", " " .. " Find file", " Telescope find_files "), + dashboard.button("n", " " .. " New file", " ene startinsert "), + dashboard.button("r", " " .. " Recent files", " Telescope oldfiles "), + dashboard.button("p", " " .. " Projects", "Telescope projects "), + dashboard.button("g", " " .. " Find text", " Telescope live_grep "), + dashboard.button("c", " " .. " Config", " lua require('lazyvim.util').telescope.config_files()() "), + dashboard.button("d", "󰉦 " .. " Dotfiles", "FloatermNew --disposable --name=dots --opener=edit --titleposition=center --height=0.85 --width=0.85 dots"), + dashboard.button("s", " " .. " Restore Session", [[ lua require("persistence").load() ]]), + dashboard.button("e", " " .. " Lazy Extras", " LazyExtras "), + dashboard.button("l", "󰒲 " .. " Lazy", " Lazy "), + dashboard.button("q", " " .. " Quit", " qa "), + } + for _, button in ipairs(dashboard.section.buttons.val) do + button.opts.hl = "AlphaButtons" + button.opts.hl_shortcut = "AlphaShortcut" + end + dashboard.section.header.opts.hl = "AlphaHeader" + dashboard.section.buttons.opts.hl = "AlphaButtons" + dashboard.section.footer.opts.hl = "AlphaFooter" + dashboard.opts.layout[1].val = 8 + return dashboard + end, + }, +} diff --git a/.config/nvim/lua/plugins/extras/fold.lua b/.config/nvim/lua/plugins/extras/ui/fold.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/fold.lua rename to .config/nvim/lua/plugins/extras/ui/fold.lua diff --git a/.config/nvim/lua/plugins/extras/rainbow-delimeters.lua b/.config/nvim/lua/plugins/extras/ui/rainbow-delimeters.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/rainbow-delimeters.lua rename to .config/nvim/lua/plugins/extras/ui/rainbow-delimeters.lua diff --git a/.config/nvim/lua/plugins/extras/scrollbar.lua b/.config/nvim/lua/plugins/extras/ui/scrollbar.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/scrollbar.lua rename to .config/nvim/lua/plugins/extras/ui/scrollbar.lua diff --git a/.config/nvim/lua/plugins/extras/ui-extended.lua b/.config/nvim/lua/plugins/extras/ui/ui-extended.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/ui-extended.lua rename to .config/nvim/lua/plugins/extras/ui/ui-extended.lua diff --git a/.config/nvim/lua/plugins/extras/zen-mode.lua b/.config/nvim/lua/plugins/extras/ui/zen-mode.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/zen-mode.lua rename to .config/nvim/lua/plugins/extras/ui/zen-mode.lua diff --git a/.config/nvim/lua/plugins/extras/discordrcp.lua b/.config/nvim/lua/plugins/extras/util/discordrcp.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/discordrcp.lua rename to .config/nvim/lua/plugins/extras/util/discordrcp.lua diff --git a/.config/nvim/lua/plugins/extras/image.lua b/.config/nvim/lua/plugins/extras/util/image.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/image.lua rename to .config/nvim/lua/plugins/extras/util/image.lua diff --git a/.config/nvim/lua/plugins/extras/smooth-scrolling.lua b/.config/nvim/lua/plugins/extras/util/smooth-scrolling.lua similarity index 100% rename from .config/nvim/lua/plugins/extras/smooth-scrolling.lua rename to .config/nvim/lua/plugins/extras/util/smooth-scrolling.lua diff --git a/.config/nvim/lua/plugins/extras/util.lua b/.config/nvim/lua/plugins/extras/util/util.lua similarity index 98% rename from .config/nvim/lua/plugins/extras/util.lua rename to .config/nvim/lua/plugins/extras/util/util.lua index b772b0e6..7485a92a 100644 --- a/.config/nvim/lua/plugins/extras/util.lua +++ b/.config/nvim/lua/plugins/extras/util/util.lua @@ -195,4 +195,10 @@ return { "ThePrimeagen/vim-be-good", cmd = "VimBeGood", }, + { + "vidocqh/auto-indent.nvim", + enabled = false, + event = "BufReadPost", + opts = {}, + }, } diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 3b970839..227ea02b 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -39,15 +39,6 @@ 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, - }, { "prochri/telescope-all-recent.nvim", dependencies = { @@ -114,21 +105,6 @@ return { }, }, 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", - }, { "dm", "Telescope dap commands", diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index fbaba400..eff22ad1 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -55,7 +55,6 @@ return { "prisma", "r", "rasi", - "regex", "ruby", "sql", "scss",