From 56c0c3b56a778eee33c44f04694b796db5a74e23 Mon Sep 17 00:00:00 2001 From: connorgmeean Date: Sat, 14 Jan 2023 12:30:13 +1100 Subject: [PATCH] refact: Switch to lazy.nvim and improve lazy loading --- init.lua | 14 +++ lua/doom/core/doom_global.lua | 5 - lua/doom/core/init.lua | 12 +-- lua/doom/core/modules.lua | 100 ++---------------- lua/doom/modules/core/doom/init.lua | 23 +--- lua/doom/modules/core/treesitter/init.lua | 6 +- lua/doom/modules/core/updater/init.lua | 1 - .../modules/features/annotations/init.lua | 2 + .../modules/features/auto_session/init.lua | 1 - lua/doom/modules/features/autopairs/init.lua | 2 +- lua/doom/modules/features/colorizer/init.lua | 2 +- lua/doom/modules/features/comment/init.lua | 1 - lua/doom/modules/features/dap/init.lua | 1 - lua/doom/modules/features/dashboard/init.lua | 2 +- .../modules/features/doom_themes/init.lua | 2 +- lua/doom/modules/features/explorer/init.lua | 1 - .../modules/features/extra_snippets/init.lua | 2 +- lua/doom/modules/features/firenvim/init.lua | 4 +- lua/doom/modules/features/illuminate/init.lua | 1 + lua/doom/modules/features/lazygit/init.lua | 2 +- lua/doom/modules/features/lsp/init.lua | 6 +- .../modules/features/lsp_progress/init.lua | 1 + lua/doom/modules/features/minimap/init.lua | 2 +- lua/doom/modules/features/neogit/init.lua | 2 +- lua/doom/modules/features/projects/init.lua | 3 +- .../modules/features/range_highlight/init.lua | 6 +- lua/doom/modules/features/ranger/init.lua | 6 +- lua/doom/modules/features/repl/init.lua | 1 + lua/doom/modules/features/statusline/init.lua | 2 +- lua/doom/modules/features/suda/init.lua | 2 +- lua/doom/modules/features/superman/init.lua | 2 +- lua/doom/modules/features/telescope/init.lua | 4 +- lua/doom/modules/features/terminal/init.lua | 2 +- .../modules/features/todo_comments/init.lua | 1 + lua/doom/modules/features/trouble/init.lua | 2 +- lua/doom/modules/features/whichkey/init.lua | 1 + lua/doom/modules/langs/json/init.lua | 4 +- lua/doom/modules/langs/lua/init.lua | 6 +- 38 files changed, 76 insertions(+), 161 deletions(-) diff --git a/init.lua b/init.lua index 3d4be671f..a2775c0e9 100644 --- a/init.lua +++ b/init.lua @@ -13,6 +13,20 @@ end local profiler = require("doom.services.profiler") profiler.start("framework|init.lua") +-- Preload lazy nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + print("Bootstrapping lazy.nvim, please wait...") + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) -- Makes sure ~/.local/share/nvim exists, to prevent problems with logging vim.fn.mkdir(vim.fn.stdpath("data"), "p") diff --git a/lua/doom/core/doom_global.lua b/lua/doom/core/doom_global.lua index d4f518e62..a42238d5c 100644 --- a/lua/doom/core/doom_global.lua +++ b/lua/doom/core/doom_global.lua @@ -60,11 +60,6 @@ doom = { -- @default = true freeze_dependencies = true, - -- Enables impatent.nvim caching to speed up start time. - -- Can cause more issues so disabled by default - -- @default false - impatient_enabled = false, - -- Autosave -- false : Disable autosave -- true : Enable autosave diff --git a/lua/doom/core/init.lua b/lua/doom/core/init.lua index 34d8b002b..b647ae866 100644 --- a/lua/doom/core/init.lua +++ b/lua/doom/core/init.lua @@ -49,18 +49,12 @@ if not utils.is_module_enabled("features", "netrw") then g.loaded_netrwFileHandlers = 1 end --- Load the colourscheme -profiler.start("framework|doom.core.ui") -utils.safe_require("doom.core.ui") -profiler.stop("framework|doom.core.ui") - -- Set some extra commands utils.safe_require("doom.core.commands") profiler.start("framework|doom.core.modules") -- Load Doom modules. local modules = utils.safe_require("doom.core.modules") -modules.start() profiler.start("framework|init enabled modules") modules.load_modules() profiler.stop("framework|init enabled modules") @@ -68,8 +62,14 @@ profiler.start("framework|user settings") modules.handle_user_config() profiler.stop("framework|user settings") modules.try_sync() +modules.handle_lazynvim() profiler.stop("framework|doom.core.modules") +-- Load the colourscheme +profiler.start("framework|doom.core.ui") +utils.safe_require("doom.core.ui") +profiler.stop("framework|doom.core.ui") + -- Execute autocommand for user to hook custom config into vim.api.nvim_exec_autocmds("User", { pattern = "DoomStarted", diff --git a/lua/doom/core/modules.lua b/lua/doom/core/modules.lua index 6cddd567f..cdebd828e 100644 --- a/lua/doom/core/modules.lua +++ b/lua/doom/core/modules.lua @@ -31,95 +31,19 @@ modules.enabled_modules = vim.tbl_deep_extend("keep", core_modules, dofile(modul local system = require("doom.core.system") ---- Initial bootstrapping of packer including auto-installation if necessary ---- Initial bootstrapping of impatient.nvim -modules.start = function() - if doom.impatient_enabled then - local has_impatient = pcall(require, "impatient") - if not has_impatient then - -- Packer Bootstrapping - local packer_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/impatient.nvim" - if vim.fn.empty(vim.fn.glob(packer_path)) > 0 then - vim.notify("Bootstrapping impatient.nvim, please wait ...") - vim.fn.system({ - "git", - "clone", - "--depth", - "1", - "https://github.com/lewis6991/impatient.nvim", - packer_path, - }) - end - - vim.cmd("packadd impatient.nvim") - - require("impatient") - end - end - - local has_packer = pcall(require, "packer") - if not has_packer then - modules._needs_sync = true - -- Packer Bootstrapping - local packer_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" - if vim.fn.empty(vim.fn.glob(packer_path)) > 0 then - vim.notify("Bootstrapping packer.nvim, please wait ...") - vim.fn.system({ - "git", - "clone", - "--depth", - "1", - "https://github.com/wbthomason/packer.nvim", - packer_path, - }) - end - - vim.cmd("packadd packer.nvim") - end - - -- Load packer - local packer = require("packer") - - -- Change some defaults - -- Of particular interest is compile_path: we use stdpath("data"), so as to not - -- have anything generated in Doom source (which goes in stdpath("config")). - packer.init({ - compile_path = system.doom_compile_path, - git = { - clone_timeout = 300, -- 5 mins - subcommands = { - -- Prevent packer from downloading all branches metadata to reduce cloning cost - -- for heavy size plugins like plenary (removed the '--no-single-branch' git flag) - install = "clone --depth %i --progress", - }, - }, - display = { - open_fn = doom.use_floating_win_packer and function() - return require("packer.util").float({ border = doom.border_style }) - end, - }, - profile = { - enable = true, - }, - log = { - level = doom.logging, - }, - }) - - packer.reset() -end - local keymaps_service = require("doom.services.keymaps") local commands_service = require("doom.services.commands") local autocmds_service = require("doom.services.autocommands") --- Applies commands, autocommands, packages from enabled modules (`modules.lua`). modules.load_modules = function() - local use = require("packer").use local logger = require("doom.utils.logging") -- Handle the Modules for section_name, _ in pairs(doom.modules) do for module_name, module in pairs(doom.modules[section_name]) do + if type(module) ~= "table" then + print(("Error on module %s type is %s val is %s"):format(module_name, type(module), module)) + end local profile_msg = ("modules|init `%s.%s`"):format(section_name, module_name) profiler.start(profile_msg) @@ -158,7 +82,7 @@ modules.load_modules = function() local spec = vim.deepcopy(packer_spec) -- Set/unset frozen packer dependencies - if type(spec.commit) == "table" then + if type(spec.version) == "table" then -- Commit can be a table of values, where the keys indicate -- which neovim version is required. spec.commit = utils.pick_compatible_field(spec.commit) @@ -168,8 +92,8 @@ modules.load_modules = function() spec.commit = nil end - -- Initialise packer - use(spec) + -- Save module spec to be initialised later + table.insert(doom.packages, spec) end end @@ -201,13 +125,6 @@ end --- Applies user's commands, autocommands, packages from `use_*` helper functions. modules.handle_user_config = function() - local use = require("packer").use - - -- Handle extra user modules - for _, packer_spec in ipairs(doom.packages) do - use(packer_spec) - end - -- Handle extra user cmds for _, cmd_spec in pairs(doom.cmds) do commands_service.set(cmd_spec[1], cmd_spec[2], cmd_spec[3] or cmd_spec.opts) @@ -233,8 +150,11 @@ modules.try_sync = function() logger.error("Doom-nvim has been installed. Please restart doom-nvim.") end, }) - require("packer").sync() end end +modules.handle_lazynvim = function() + require("lazy").setup(doom.packages) +end + return modules diff --git a/lua/doom/modules/core/doom/init.lua b/lua/doom/modules/core/doom/init.lua index 6bb15dd16..5d94dd256 100644 --- a/lua/doom/modules/core/doom/init.lua +++ b/lua/doom/modules/core/doom/init.lua @@ -5,35 +5,16 @@ required.settings = { } required.packages = { - ["packer.nvim"] = { - "wbthomason/packer.nvim", - }, - -- Required by some treesitter modules - ["aniseed"] = { - "Olical/aniseed", - commit = "9892a40d4cf970a2916a984544b7f984fc12f55c", - module_pattern = "aniseed", + ["lazy.nvim"] = { + "folke/lazy.nvim", }, ["plenary.nvim"] = { "nvim-lua/plenary.nvim", commit = "4b7e52044bbb84242158d977a50c4cbcd85070c7", - module = "plenary", - }, - ["popup.nvim"] = { - "nvim-lua/popup.nvim", - commit = "b7404d35d5d3548a82149238289fa71f7f6de4ac", - module = "popup", }, ["nvim-web-devicons"] = { "kyazdani42/nvim-web-devicons", commit = "a8cf88cbdb5c58e2b658e179c4b2aa997479b3da", - module = "nvim-web-devicons", - }, - -- Must include impatient.nvim here, even though it's bootstrapped in - -- core.modules.lua so that packer doesn't try and clean it up. - ["impatient.nvim"] = { - "lewis6991/impatient.nvim", - disabled = not doom.impatient_enabled, }, } diff --git a/lua/doom/modules/core/treesitter/init.lua b/lua/doom/modules/core/treesitter/init.lua index bbd454d16..583be43f8 100644 --- a/lua/doom/modules/core/treesitter/init.lua +++ b/lua/doom/modules/core/treesitter/init.lua @@ -48,20 +48,22 @@ treesitter.packages = { "nvim-treesitter/nvim-treesitter", commit = { ["nvim-0.7"] = "d76b0de6536c2461f97cfeca0550f8cb89793935", - ["latest"] = "82767f3f33c903e92f059dc9a2b27ec38dcc28d7", + ["latest"] = "be0b3ba1b90b2aa5c78ff7a5798d477a744e5cbe", }, - run = ":TSUpdate", + build = ":TSUpdate", branch = "master", }, ["nvim-ts-context-commentstring"] = { "JoosepAlviste/nvim-ts-context-commentstring", commit = "4d3a68c41a53add8804f471fcc49bb398fe8de08", after = "nvim-treesitter", + event = "VeryLazy", }, ["nvim-ts-autotag"] = { "windwp/nvim-ts-autotag", commit = "fdefe46c6807441460f11f11a167a2baf8e4534b", after = "nvim-treesitter", + event = "VeryLazy", }, } diff --git a/lua/doom/modules/core/updater/init.lua b/lua/doom/modules/core/updater/init.lua index 489ad551b..579876a04 100644 --- a/lua/doom/modules/core/updater/init.lua +++ b/lua/doom/modules/core/updater/init.lua @@ -25,7 +25,6 @@ updater.packages = { ["plenary.nvim"] = { "nvim-lua/plenary.nvim", commit = "4b7e52044bbb84242158d977a50c4cbcd85070c7", - module = "plenary", }, } diff --git a/lua/doom/modules/features/annotations/init.lua b/lua/doom/modules/features/annotations/init.lua index f5c406615..9382fd1b2 100644 --- a/lua/doom/modules/features/annotations/init.lua +++ b/lua/doom/modules/features/annotations/init.lua @@ -20,6 +20,8 @@ annotations.packages = { ["neogen"] = { "danymat/neogen", commit = "967b280d7d7ade52d97d06e868ec4d9a0bc59282", + keys = { "cg" }, + cmd = "Neogen", after = "nvim-treesitter", }, } diff --git a/lua/doom/modules/features/auto_session/init.lua b/lua/doom/modules/features/auto_session/init.lua index 50ef3b23a..65233587e 100644 --- a/lua/doom/modules/features/auto_session/init.lua +++ b/lua/doom/modules/features/auto_session/init.lua @@ -8,7 +8,6 @@ auto_session.packages = { ["persistence.nvim"] = { "folke/persistence.nvim", commit = "251e89523dabc94242d4a1f2226fc44a95c29d9e", - module = "persistence", }, } diff --git a/lua/doom/modules/features/autopairs/init.lua b/lua/doom/modules/features/autopairs/init.lua index f145bb42b..b5f4c0b98 100644 --- a/lua/doom/modules/features/autopairs/init.lua +++ b/lua/doom/modules/features/autopairs/init.lua @@ -10,7 +10,7 @@ autopairs.packages = { ["nvim-autopairs"] = { "windwp/nvim-autopairs", commit = "4fc96c8f3df89b6d23e5092d31c866c53a346347", - event = "BufReadPost", + event = "InsertEnter", }, } diff --git a/lua/doom/modules/features/colorizer/init.lua b/lua/doom/modules/features/colorizer/init.lua index a18d76af2..86f961b35 100644 --- a/lua/doom/modules/features/colorizer/init.lua +++ b/lua/doom/modules/features/colorizer/init.lua @@ -10,7 +10,7 @@ colorizer.packages = { ["nvim-colorizer.lua"] = { "norcalli/nvim-colorizer.lua", commit = "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6", - event = "WinEnter", + event = "VeryLazy", }, } diff --git a/lua/doom/modules/features/comment/init.lua b/lua/doom/modules/features/comment/init.lua index 05b309209..64582bd0c 100644 --- a/lua/doom/modules/features/comment/init.lua +++ b/lua/doom/modules/features/comment/init.lua @@ -45,7 +45,6 @@ comment.packages = { ["Comment.nvim"] = { "numToStr/Comment.nvim", commit = "98c81efa6ac1946b63eef685c27f8da928d9f4e7", - module = "Comment", }, } diff --git a/lua/doom/modules/features/dap/init.lua b/lua/doom/modules/features/dap/init.lua index 391bf9d63..6e392b08c 100644 --- a/lua/doom/modules/features/dap/init.lua +++ b/lua/doom/modules/features/dap/init.lua @@ -39,7 +39,6 @@ dap.packages = { ["nvim-dap"] = { "mfussenegger/nvim-dap", commit = "0b320f5bd4e5f81e8376f9d9681b5c4ee4483c25", - module = "dap", }, ["nvim-dap-ui"] = { "rcarriga/nvim-dap-ui", diff --git a/lua/doom/modules/features/dashboard/init.lua b/lua/doom/modules/features/dashboard/init.lua index 49de2def2..aaf837cf1 100644 --- a/lua/doom/modules/features/dashboard/init.lua +++ b/lua/doom/modules/features/dashboard/init.lua @@ -69,7 +69,7 @@ dashboard.packages = { "glepnir/dashboard-nvim", commit = "1676ebeb334a644dd68f7858f9e993602dd8577c", cmd = "Dashboard", - opt = true, + lazy = true, }, } diff --git a/lua/doom/modules/features/doom_themes/init.lua b/lua/doom/modules/features/doom_themes/init.lua index ba642fed4..92df2a1d6 100644 --- a/lua/doom/modules/features/doom_themes/init.lua +++ b/lua/doom/modules/features/doom_themes/init.lua @@ -9,7 +9,7 @@ doom_themes.packages = { "GustavoPrietoP/doom-themes.nvim", commit = "03d417d3eab71c320744f8da22251715ba6cee53", event = "ColorScheme", - opt = true, + lazy = true, }, } diff --git a/lua/doom/modules/features/explorer/init.lua b/lua/doom/modules/features/explorer/init.lua index bd5fb5b98..b702de304 100644 --- a/lua/doom/modules/features/explorer/init.lua +++ b/lua/doom/modules/features/explorer/init.lua @@ -95,7 +95,6 @@ explorer.packages = { ["nvim-tree.lua"] = { "kyazdani42/nvim-tree.lua", commit = "7282f7de8aedf861fe0162a559fc2b214383c51c", - module = "nvim-tree.api", cmd = { "NvimTreeClipboard", "NvimTreeClose", diff --git a/lua/doom/modules/features/extra_snippets/init.lua b/lua/doom/modules/features/extra_snippets/init.lua index b52751b50..4766343f3 100644 --- a/lua/doom/modules/features/extra_snippets/init.lua +++ b/lua/doom/modules/features/extra_snippets/init.lua @@ -5,7 +5,7 @@ extra_snippets.settings = {} extra_snippets.packages = { ["friendly-snippets"] = { "rafamadriz/friendly-snippets", - after = "LuaSnip", + event = "VeryLazy", }, } diff --git a/lua/doom/modules/features/firenvim/init.lua b/lua/doom/modules/features/firenvim/init.lua index 5c3350252..a761c353a 100644 --- a/lua/doom/modules/features/firenvim/init.lua +++ b/lua/doom/modules/features/firenvim/init.lua @@ -26,10 +26,10 @@ firenvim.packages = { ["firenvim"] = { "glacambre/firenvim", commit = "56a49d79904921a8b4405786e12b4e12fbbf171b", - run = function() + build = function() vim.fn["firenvim#install"](0) end, - opt = true, + lazy = true, }, } diff --git a/lua/doom/modules/features/illuminate/init.lua b/lua/doom/modules/features/illuminate/init.lua index c649e9125..6418301a7 100644 --- a/lua/doom/modules/features/illuminate/init.lua +++ b/lua/doom/modules/features/illuminate/init.lua @@ -17,6 +17,7 @@ illuminate.packages = { ["vim-illuminate"] = { "RRethy/vim-illuminate", commit = "0603e75fc4ecde1ee5a1b2fc8106ed6704f34d14", + event = "VeryLazy", }, } diff --git a/lua/doom/modules/features/lazygit/init.lua b/lua/doom/modules/features/lazygit/init.lua index 0776adabf..96a378b26 100644 --- a/lua/doom/modules/features/lazygit/init.lua +++ b/lua/doom/modules/features/lazygit/init.lua @@ -7,7 +7,7 @@ lazygit.packages = { "kdheepak/lazygit.nvim", commit = "9c73fd69a4c1cb3b3fc35b741ac968e331642600", cmd = { "LazyGit", "LazyGitConfig" }, - opt = true, + lazy = true, }, } diff --git a/lua/doom/modules/features/lsp/init.lua b/lua/doom/modules/features/lsp/init.lua index e2a277716..905d35356 100644 --- a/lua/doom/modules/features/lsp/init.lua +++ b/lua/doom/modules/features/lsp/init.lua @@ -101,15 +101,14 @@ lsp.packages = { ["nvim-lspconfig"] = { "neovim/nvim-lspconfig", commit = "334cc8601ce5f04384ebe79527284fd177938412", - module = "lspconfig", }, ["nvim-cmp"] = { "hrsh7th/nvim-cmp", commit = "0e436ee23abc6c3fe5f3600145d2a413703e7272", - requires = { + event = "InsertEnter", + dependencies = { "L3MON4D3/LuaSnip", commit = "53e812a6f51c9d567c98215733100f0169bcc20a", - module = "luasnip", }, }, ["cmp-nvim-lua"] = { @@ -141,6 +140,7 @@ lsp.packages = { "ray-x/lsp_signature.nvim", commit = "e65a63858771db3f086c8d904ff5f80705fd962b", after = "nvim-lspconfig", + event = "VeryLazy", }, } diff --git a/lua/doom/modules/features/lsp_progress/init.lua b/lua/doom/modules/features/lsp_progress/init.lua index 70a017255..e711102c6 100644 --- a/lua/doom/modules/features/lsp_progress/init.lua +++ b/lua/doom/modules/features/lsp_progress/init.lua @@ -7,6 +7,7 @@ fidget.packages = { "j-hui/fidget.nvim", commit = "1097a86db8ba38e390850dc4035a03ed234a4673", after = "nvim-lspconfig", + event = "VeryLazy", }, } diff --git a/lua/doom/modules/features/minimap/init.lua b/lua/doom/modules/features/minimap/init.lua index 6f3d3841f..46f119243 100644 --- a/lua/doom/modules/features/minimap/init.lua +++ b/lua/doom/modules/features/minimap/init.lua @@ -6,7 +6,7 @@ minimap.packages = { ["minimap.vim"] = { "wfxr/minimap.vim", commit = "3801d9dfaa5431e7b83ae6f98423ac077d9f5c3f", - opt = true, + lazy = true, cmd = { "Minimap", "MinimapClose", diff --git a/lua/doom/modules/features/neogit/init.lua b/lua/doom/modules/features/neogit/init.lua index 91bee0cc6..c3cd8d459 100644 --- a/lua/doom/modules/features/neogit/init.lua +++ b/lua/doom/modules/features/neogit/init.lua @@ -7,7 +7,7 @@ neogit.packages = { "TimUntersberger/neogit", commit = "74c9e29b61780345d3ad9d7a4a4437607caead4a", cmd = "Neogit", - opt = true, + lazy = true, }, } diff --git a/lua/doom/modules/features/projects/init.lua b/lua/doom/modules/features/projects/init.lua index 21181ccf7..a9f9ba880 100644 --- a/lua/doom/modules/features/projects/init.lua +++ b/lua/doom/modules/features/projects/init.lua @@ -39,7 +39,8 @@ projects.packages = { ["project.nvim"] = { "ahmedkhalf/project.nvim", commit = "628de7e433dd503e782831fe150bb750e56e55d6", - requires = { "nvim-treesitter/nvim-treesitter" }, + cmd = "Telescope projects", + dependencies = { "nvim-treesitter/nvim-treesitter" }, }, } diff --git a/lua/doom/modules/features/range_highlight/init.lua b/lua/doom/modules/features/range_highlight/init.lua index 42f9a263e..4cbe73fc7 100644 --- a/lua/doom/modules/features/range_highlight/init.lua +++ b/lua/doom/modules/features/range_highlight/init.lua @@ -6,10 +6,10 @@ range_highlight.packages = { ["range-highlight.nvim"] = { "winston0410/range-highlight.nvim", commit = "8b5e8ccb3460b2c3675f4639b9f54e64eaab36d9", - requires = { - { "winston0410/cmd-parser.nvim", module = "cmd-parser" }, + dependencies = { + { "winston0410/cmd-parser.nvim" }, }, - event = "BufReadPre", + event = "VeryLazy", }, } diff --git a/lua/doom/modules/features/ranger/init.lua b/lua/doom/modules/features/ranger/init.lua index b525fd7a2..b30146228 100644 --- a/lua/doom/modules/features/ranger/init.lua +++ b/lua/doom/modules/features/ranger/init.lua @@ -6,10 +6,10 @@ ranger.packages = { ["ranger.vim"] = { "francoiscabrol/ranger.vim", commit = "91e82debdf566dfaf47df3aef0a5fd823cedf41c", - requires = { - { "rbgrouleff/bclose.vim", opt = true }, + dependencies = { + "rbgrouleff/bclose.vim" }, - opt = true, + lazy = true, cmd = { "Ranger", "RangerNewTab", diff --git a/lua/doom/modules/features/repl/init.lua b/lua/doom/modules/features/repl/init.lua index f8b695f03..a4c9b6ab6 100644 --- a/lua/doom/modules/features/repl/init.lua +++ b/lua/doom/modules/features/repl/init.lua @@ -42,6 +42,7 @@ repl.packages = { ["iron.nvim"] = { "hkupty/iron.nvim", commit = "d1e80812aacd0c7e1a5c3050596716851d223ce9", + cmd = "IronRepl", }, } diff --git a/lua/doom/modules/features/statusline/init.lua b/lua/doom/modules/features/statusline/init.lua index 11cc25f08..9d4a20b71 100644 --- a/lua/doom/modules/features/statusline/init.lua +++ b/lua/doom/modules/features/statusline/init.lua @@ -500,7 +500,7 @@ statusline.autocmds = { function() vim.defer_fn(function() statusline.try_refresh() - end, 100) + end, 50) end, once = true, }, diff --git a/lua/doom/modules/features/suda/init.lua b/lua/doom/modules/features/suda/init.lua index 1be806dcc..17bb9670f 100644 --- a/lua/doom/modules/features/suda/init.lua +++ b/lua/doom/modules/features/suda/init.lua @@ -6,7 +6,7 @@ suda.packages = { ["suda.vim"] = { "lambdalisue/suda.vim", commit = "6bffe36862faa601d2de7e54f6e85c1435e832d0", - opt = true, + lazy = true, cmd = { "SudaRead", "SudaWrite" }, }, } diff --git a/lua/doom/modules/features/superman/init.lua b/lua/doom/modules/features/superman/init.lua index 671018b34..0a1b7c4df 100644 --- a/lua/doom/modules/features/superman/init.lua +++ b/lua/doom/modules/features/superman/init.lua @@ -7,7 +7,7 @@ superman.packages = { "jez/vim-superman", commit = "19d307446576d9118625c5d9d3c7a4c9bec5571a", cmd = "SuperMan", - opt = true, + lazy = true, }, } diff --git a/lua/doom/modules/features/telescope/init.lua b/lua/doom/modules/features/telescope/init.lua index 8c529256b..21fa6bdb0 100644 --- a/lua/doom/modules/features/telescope/init.lua +++ b/lua/doom/modules/features/telescope/init.lua @@ -51,7 +51,7 @@ telescope.packages = { "nvim-telescope/telescope.nvim", commit = "f174a0367b4fc7cb17710d867e25ea792311c418", cmd = "Telescope", - opt = true, + lazy = true, }, ["telescope-file-browser.nvim"] = { "nvim-telescope/telescope-file-browser.nvim", @@ -59,7 +59,7 @@ telescope.packages = { cmd = "Telescope browse_files", key = ".", after = "telescope.nvim", - opt = true, + lazy = true, }, } diff --git a/lua/doom/modules/features/terminal/init.lua b/lua/doom/modules/features/terminal/init.lua index 9ed43d690..ce126efa5 100644 --- a/lua/doom/modules/features/terminal/init.lua +++ b/lua/doom/modules/features/terminal/init.lua @@ -27,7 +27,7 @@ terminal.packages = { "akinsho/toggleterm.nvim", commit = "2a787c426ef00cb3488c11b14f5dcf892bbd0bda", cmd = { "ToggleTerm", "TermExec" }, - opt = true, + lazy = true, }, } diff --git a/lua/doom/modules/features/todo_comments/init.lua b/lua/doom/modules/features/todo_comments/init.lua index 960f57707..0a1e41bd4 100644 --- a/lua/doom/modules/features/todo_comments/init.lua +++ b/lua/doom/modules/features/todo_comments/init.lua @@ -6,6 +6,7 @@ todo_comments.packages = { ["todo-comments.nvim"] = { "folke/todo-comments.nvim", commit = "8df75dbb9ddd78a378b9661f25f0b193f38f06dd", + event = "VeryLazy", }, } diff --git a/lua/doom/modules/features/trouble/init.lua b/lua/doom/modules/features/trouble/init.lua index 45e330515..9dbb2817d 100644 --- a/lua/doom/modules/features/trouble/init.lua +++ b/lua/doom/modules/features/trouble/init.lua @@ -7,7 +7,7 @@ trouble.packages = { "folke/trouble.nvim", commit = "929315ea5f146f1ce0e784c76c943ece6f36d786", cmd = { "Trouble", "TroubleClose", "TroubleRefresh", "TroubleToggle" }, - opt = true, + lazy = true, }, } diff --git a/lua/doom/modules/features/whichkey/init.lua b/lua/doom/modules/features/whichkey/init.lua index 917fca860..26e597620 100644 --- a/lua/doom/modules/features/whichkey/init.lua +++ b/lua/doom/modules/features/whichkey/init.lua @@ -65,6 +65,7 @@ whichkey.packages = { ["which-key.nvim"] = { "folke/which-key.nvim", commit = "6885b669523ff4238de99a7c653d47b081b5506d", + keys = { "" }, }, } diff --git a/lua/doom/modules/langs/json/init.lua b/lua/doom/modules/langs/json/init.lua index 501373418..b39c86728 100644 --- a/lua/doom/modules/langs/json/init.lua +++ b/lua/doom/modules/langs/json/init.lua @@ -44,7 +44,7 @@ json.packages = { ["SchemaStore.nvim"] = { "b0o/SchemaStore.nvim", commit = "f55842dc797faad8cf7b0d9ce75c59da654aa018", - opt = true, + ft = "json", }, } @@ -54,7 +54,7 @@ json.autocmds = { "FileType", "json", langs_utils.wrap_language_setup("json", function() - vim.cmd("packadd SchemaStore.nvim") + -- require("lazy").load("SchemaStore.nvim") if not json.settings.disable_lsp then langs_utils.use_lsp_mason(json.settings.lsp_name, { config = json.settings.lsp_config, diff --git a/lua/doom/modules/langs/lua/init.lua b/lua/doom/modules/langs/lua/init.lua index fbfd6210e..9c714d63f 100644 --- a/lua/doom/modules/langs/lua/init.lua +++ b/lua/doom/modules/langs/lua/init.lua @@ -23,7 +23,7 @@ lua.settings = { settings = { Lua = { runtime = { - version = "LuaJIT", + commit = "LuaJIT", }, diagnostics = { globals = { "vim", "doom" }, @@ -81,7 +81,7 @@ lua.packages = { ["lua-dev.nvim"] = { "folke/lua-dev.nvim", commit = "f0da5bcc6ecddd121a67815a821cdb7452755e9e", - opt = true, + ft = "lua", }, } @@ -91,7 +91,7 @@ lua.autocmds = { "FileType", "lua", langs_utils.wrap_language_setup("lua", function() - vim.cmd("packadd lua-dev.nvim") + -- require("lazy").load("lua-dev.nvim") local runtime_path = vim.split(package.path, ";") table.insert(runtime_path, "lua/?.lua") table.insert(runtime_path, "lua/?/init.lua")