From 816eca31b73f7a68821e0c1ab107e3cc6456d02e Mon Sep 17 00:00:00 2001 From: rootiest Date: Sat, 8 Feb 2025 20:28:57 -0500 Subject: [PATCH] fix!: move all lazyvim extras into a single file This is a necessary change to ensure they are loaded before any other plugins. Prevents a warning message at startup. --- lua/config/lazy.lua | 14 +++- lua/lvplugs/lvplugs.lua | 141 ++++++++++++++++++++++++++++++++++++++ lua/plugins/ai.lua | 22 ------ lua/plugins/cmp.lua | 4 -- lua/plugins/coding.lua | 9 --- lua/plugins/core.lua | 5 -- lua/plugins/debug.lua | 9 --- lua/plugins/editor.lua | 26 ------- lua/plugins/git.lua | 3 - lua/plugins/languages.lua | 36 ---------- lua/plugins/mini.lua | 5 -- lua/plugins/telescope.lua | 51 +++++++------- lua/plugins/util.lua | 6 -- 13 files changed, 179 insertions(+), 152 deletions(-) create mode 100644 lua/lvplugs/lvplugs.lua diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 30c40c2..3de6710 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -20,13 +20,18 @@ vim.opt.rtp:prepend(vim.env.LAZY or lazypath) -- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ PLUGINS ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ local plugin_specs = { + { -- LazyVim + 'LazyVim/LazyVim', + priority = 900, + opts = require('data.types').lazyvim.opts, + }, { - 'LazyVim/LazyVim', -- LazyVim import = 'lazyvim.plugins', -- LazyVim Core Plugins }, { -- VSCode import = 'lazyvim.plugins.extras.vscode', }, + { import = 'lvplugs' }, -- LazyVim Plugins { import = 'plugins' }, -- General Plugins } @@ -53,7 +58,12 @@ require('lazy').setup({ }, install = { missing = true, - colorscheme = { 'catppuccin-mocha', 'tokyonight', 'default' }, + colorscheme = { + -- 'ex-catppuccin-mocha', + 'catppuccin-mocha', + 'tokyonight', + 'default', + }, }, defaults = { lazy = true, diff --git a/lua/lvplugs/lvplugs.lua b/lua/lvplugs/lvplugs.lua new file mode 100644 index 0000000..7bcc41e --- /dev/null +++ b/lua/lvplugs/lvplugs.lua @@ -0,0 +1,141 @@ +return { + { -- Codeium + import = 'lazyvim.plugins.extras.ai.codeium', + cond = require('data.cond').codeium, + event = 'VeryLazy', + lazy = true, + opts = function() + require('codeium.virtual_text').set_statusbar_refresh(function() + require('lualine').refresh() + end) + end, + }, + { -- Copilot + import = 'lazyvim.plugins.extras.ai.copilot', + cond = require('data.cond').copilot, + }, + { -- Tabnine + import = 'lazyvim.plugins.extras.ai.tabnine', + cond = require('data.cond').tabnine, + }, + { -- luasnip + import = 'lazyvim.plugins.extras.coding.luasnip', + }, + { -- Yanky + import = 'lazyvim.plugins.extras.coding.yanky', + }, + { -- Neogen + import = 'lazyvim.plugins.extras.coding.neogen', + }, + { -- DAP Core + import = 'lazyvim.plugins.extras.dap.core', + }, + { -- DAP Neovim Lua Adapter + import = 'lazyvim.plugins.extras.dap.nlua', + }, + { -- NeoTest + import = 'lazyvim.plugins.extras.test.core', + }, + -- { -- Aerial + -- import = 'lazyvim.plugins.extras.editor.aerial', + -- }, + { import = 'lazyvim.plugins.extras.ui.smear-cursor' }, + { -- Dial + import = 'lazyvim.plugins.extras.editor.dial', + }, + { -- Illuminate + import = 'lazyvim.plugins.extras.editor.illuminate', + }, + { -- Snacks Picker + import = 'lazyvim.plugins.extras.editor.snacks_picker', + }, + -- { -- Outline + -- import = 'lazyvim.plugins.extras.editor.outline', + -- }, + { -- IncRename + import = 'lazyvim.plugins.extras.editor.inc-rename', + }, + { -- Treesitter-context + import = 'lazyvim.plugins.extras.ui.treesitter-context', + }, + { -- Navic + import = 'lazyvim.plugins.extras.editor.navic', + }, + { -- Refactoring + import = 'lazyvim.plugins.extras.editor.refactoring', + }, + -- { + -- import = 'lazyvim.plugins.extras.editor.harpoon2', + -- }, + { -- Octo plugin + import = 'lazyvim.plugins.extras.util.octo', + }, + { -- JSON + import = 'lazyvim.plugins.extras.lang.json', + }, + { -- Markdown + import = 'lazyvim.plugins.extras.lang.markdown', + }, + { -- Toml + import = 'lazyvim.plugins.extras.lang.toml', + }, + { -- Git + import = 'lazyvim.plugins.extras.lang.git', + }, + { -- Python + import = 'lazyvim.plugins.extras.lang.python', + }, + { -- Yaml + import = 'lazyvim.plugins.extras.lang.yaml', + }, + { -- clangd + import = 'lazyvim.plugins.extras.lang.clangd', + }, + { -- cmake + import = 'lazyvim.plugins.extras.lang.cmake', + }, + { -- Docker + import = 'lazyvim.plugins.extras.lang.docker', + }, + { -- Java + import = 'lazyvim.plugins.extras.lang.java', + }, + { -- Sql + import = 'lazyvim.plugins.extras.lang.sql', + }, + { -- Rust + import = 'lazyvim.plugins.extras.lang.rust', + }, + -- { -- Mini.Indentscope + -- import = 'lazyvim.plugins.extras.ui.mini-indentscope', + -- }, + { -- mini.files + import = 'lazyvim.plugins.extras.editor.mini-files', + }, + { import = 'lazyvim.plugins.extras.editor.snacks_picker' }, + { import = 'lazyvim.plugins.extras.editor.snacks_explorer' }, + { + import = 'lazyvim.plugins.extras.editor.fzf', + cond = function() + return require('data.func').check_global_var('use_fzf_lua', true, false) + end, + }, + { -- Chezmoi + import = 'lazyvim.plugins.extras.util.chezmoi', + }, + { -- Dotfiles plugins + import = 'lazyvim.plugins.extras.util.dot', + }, + { -- Blink completion + import = 'lazyvim.plugins.extras.coding.blink', + cond = function() + return vim.g.useblinkcmp + end, + }, + { + import = 'lazyvim.plugins.extras.coding.nvim-cmp', + cond = function() + return not vim.g.useblinkcmp + end, + }, +} diff --git a/lua/plugins/ai.lua b/lua/plugins/ai.lua index 8187ae9..7593f36 100644 --- a/lua/plugins/ai.lua +++ b/lua/plugins/ai.lua @@ -13,28 +13,6 @@ return { cond = require('data.cond').neocodeium, dependencies = { 'hrsh7th/nvim-cmp' }, }, - { -- Codeium - import = 'lazyvim.plugins.extras.ai.codeium', - cond = require('data.cond').codeium, - event = 'VeryLazy', - lazy = true, - opts = function() - require('codeium.virtual_text').set_statusbar_refresh(function() - require('lualine').refresh() - end) - end, - }, - { -- Copilot - import = 'lazyvim.plugins.extras.ai.copilot', - cond = require('data.cond').copilot, - }, - { -- Copilot - import = 'lazyvim.plugins.extras.ai.copilot-chat', - }, - { -- Tabnine - import = 'lazyvim.plugins.extras.ai.tabnine', - cond = require('data.cond').tabnine, - }, { -- Minuet-AI 'milanglacier/minuet-ai.nvim', dependencies = require('data.deps').minuet, diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index e297e16..03b801e 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -30,9 +30,6 @@ if vim.g.useblinkcmp then vim.g.lazyvim_blink_main = true end return { - { -- Blink completion - import = 'lazyvim.plugins.extras.coding.blink', - }, { 'saghen/blink.cmp', opts = { @@ -170,7 +167,6 @@ end -- Else use nvim-cmp return { - { import = 'lazyvim.plugins.extras.coding.nvim-cmp' }, { -- cmp url = cmp_repo.url, build = cmp_repo.build, diff --git a/lua/plugins/coding.lua b/lua/plugins/coding.lua index 0b692b8..3e3b38b 100644 --- a/lua/plugins/coding.lua +++ b/lua/plugins/coding.lua @@ -9,9 +9,6 @@ return { 'williamboman/mason-lspconfig.nvim', opts = require('data.types').mason_lsp_config.opts, }, - { -- luasnip - import = 'lazyvim.plugins.extras.coding.luasnip', - }, { -- nvim-treesitter 'nvim-treesitter/nvim-treesitter', opts = require('data.types').treesitter.opts, @@ -26,18 +23,12 @@ return { 'neovim/nvim-lspconfig', opts = require('data.types').lspconfig.opts, }, - { -- Yanky - import = 'lazyvim.plugins.extras.coding.yanky', - }, { -- Yanky 'gbprod/yanky.nvim', requires = { 'kkharji/sqlite.lua' }, opts = require('data.types').yanky, keys = require('data.keys').yanky, }, - { -- Neogen - import = 'lazyvim.plugins.extras.coding.neogen', - }, { 'folke/lazydev.nvim', opts = { diff --git a/lua/plugins/core.lua b/lua/plugins/core.lua index f0a263a..d0a4415 100644 --- a/lua/plugins/core.lua +++ b/lua/plugins/core.lua @@ -6,11 +6,6 @@ return { -- require("config.rocks").plugin_spec, - { -- LazyVim - 'LazyVim/LazyVim', - priority = 900, - opts = require('data.types').lazyvim.opts, - }, { -- Bufferline 'akinsho/bufferline.nvim', cond = require('data.types').bufferline.enabled, diff --git a/lua/plugins/debug.lua b/lua/plugins/debug.lua index c588cb2..b43f182 100644 --- a/lua/plugins/debug.lua +++ b/lua/plugins/debug.lua @@ -5,15 +5,6 @@ -- ╰─────────────────────────────────────────────────────────╯ return { - { -- DAP Core - import = 'lazyvim.plugins.extras.dap.core', - }, - { -- DAP Neovim Lua Adapter - import = 'lazyvim.plugins.extras.dap.nlua', - }, - { -- NeoTest - import = 'lazyvim.plugins.extras.test.core', - }, { -- Neotest Plenary 'nvim-neotest/neotest-plenary', }, diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua index 2976051..8688e48 100644 --- a/lua/plugins/editor.lua +++ b/lua/plugins/editor.lua @@ -5,16 +5,6 @@ -- ╰─────────────────────────────────────────────────────────╯ return { - { -- Aerial - import = 'lazyvim.plugins.extras.editor.aerial', - }, - { import = 'lazyvim.plugins.extras.ui.smear-cursor' }, - { -- Dial - import = 'lazyvim.plugins.extras.editor.dial', - }, - { -- Illuminate - import = 'lazyvim.plugins.extras.editor.illuminate', - }, { -- Illuminate 'ehpi/vim-illuminate', opts = { @@ -26,22 +16,6 @@ return { }, }, }, - { -- Outline - import = 'lazyvim.plugins.extras.editor.outline', - }, - { -- IncRename - - import = 'lazyvim.plugins.extras.editor.inc-rename', - }, - { -- Treesitter-context - import = 'lazyvim.plugins.extras.ui.treesitter-context', - }, - { -- Navic - import = 'lazyvim.plugins.extras.editor.navic', - }, - { -- Refactoring - import = 'lazyvim.plugins.extras.editor.refactoring', - }, { -- Grug-Far 'MagicDuck/grug-far.nvim', opts = { diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua index cec875a..3ffd9ae 100644 --- a/lua/plugins/git.lua +++ b/lua/plugins/git.lua @@ -5,9 +5,6 @@ -- ╰─────────────────────────────────────────────────────────╯ return { - { -- Octo plugin - import = 'lazyvim.plugins.extras.util.octo', - }, { -- Gist Tools 'Rawnly/gist.nvim', lazy = true, diff --git a/lua/plugins/languages.lua b/lua/plugins/languages.lua index e4d3d24..e0c6df0 100644 --- a/lua/plugins/languages.lua +++ b/lua/plugins/languages.lua @@ -5,42 +5,6 @@ -- ╰─────────────────────────────────────────────────────────╯ return { - { -- JSON - import = 'lazyvim.plugins.extras.lang.json', - }, - { -- Markdown - import = 'lazyvim.plugins.extras.lang.markdown', - }, - { -- Toml - import = 'lazyvim.plugins.extras.lang.toml', - }, - { -- Git - import = 'lazyvim.plugins.extras.lang.git', - }, - { -- Python - import = 'lazyvim.plugins.extras.lang.python', - }, - { -- Yaml - import = 'lazyvim.plugins.extras.lang.yaml', - }, - { -- clangd - import = 'lazyvim.plugins.extras.lang.clangd', - }, - { -- cmake - import = 'lazyvim.plugins.extras.lang.cmake', - }, - { -- Docker - import = 'lazyvim.plugins.extras.lang.docker', - }, - { -- Java - import = 'lazyvim.plugins.extras.lang.java', - }, - { -- Sql - import = 'lazyvim.plugins.extras.lang.sql', - }, - { -- Rust - import = 'lazyvim.plugins.extras.lang.rust', - }, { -- Jinja 'armyers/Vim-Jinja2-Syntax', }, diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua index 6690f09..d1990a3 100644 --- a/lua/plugins/mini.lua +++ b/lua/plugins/mini.lua @@ -10,8 +10,6 @@ return { event = 'VeryLazy', opts = {}, }, - -- { -- Mini.Indentscope - -- import = 'lazyvim.plugins.extras.ui.mini-indentscope', -- }, { -- Mini Indentscope 'echasnovski/mini.indentscope', @@ -36,9 +34,6 @@ return { 'echasnovski/mini.surround', opts = {}, }, - { -- mini.files - import = 'lazyvim.plugins.extras.editor.mini-files', - }, { -- mini.files 'echasnovski/mini.files', opts = require('data.types').minifiles.opts, diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index fbb2af1..807cf6f 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -175,31 +175,32 @@ local P = { -- Define Telescope Plugins Specs }, } -if require('data.func').check_global_var('use_telescope', false, true) then - P = { { import = 'lazyvim.plugins.extras.editor.fzf' } } -end -if require('data.func').check_global_var('use_fzf_lua', true, false) then - table.insert(P, 1, { import = 'lazyvim.plugins.extras.editor.fzf' }) - table.insert(P, 2, { - 'ibhagwan/fzf-lua', - lazy = true, - event = 'VeryLazy', - opts = { - previewers = { - builtin = { - extensions = { - -- neovim terminal only supports `viu` block output - ['png'] = { 'viu', '-b' }, - -- by default the filename is added as last argument - -- if required, use `{file}` for argument positioning - ['svg'] = { 'viu', '-b' }, - ['jpg'] = { 'viu', '-b' }, - }, - }, - }, - }, - }) -end +-- if require('data.func').check_global_var('use_fzf_lua', true, false) then +-- P = { { import = 'lazyvim.plugins.extras.editor.fzf' } } +-- end +-- +-- if require('data.func').check_global_var('use_fzf_lua', true, false) then +-- table.insert(P, 1, { import = 'lazyvim.plugins.extras.editor.fzf' }) +-- table.insert(P, 2, { +-- 'ibhagwan/fzf-lua', +-- lazy = true, +-- event = 'VeryLazy', +-- opts = { +-- previewers = { +-- builtin = { +-- extensions = { +-- -- neovim terminal only supports `viu` block output +-- ['png'] = { 'viu', '-b' }, +-- -- by default the filename is added as last argument +-- -- if required, use `{file}` for argument positioning +-- ['svg'] = { 'viu', '-b' }, +-- ['jpg'] = { 'viu', '-b' }, +-- }, +-- }, +-- }, +-- }, +-- }) +-- end return P diff --git a/lua/plugins/util.lua b/lua/plugins/util.lua index f3fc121..67e077e 100644 --- a/lua/plugins/util.lua +++ b/lua/plugins/util.lua @@ -5,12 +5,6 @@ -- ╰─────────────────────────────────────────────────────────╯ return { - { -- Chezmoi - import = 'lazyvim.plugins.extras.util.chezmoi', - }, - { -- Dotfiles plugins - import = 'lazyvim.plugins.extras.util.dot', - }, { -- Env file no diagnostics 'nvim-treesitter/nvim-treesitter', lazy = true,