From ce4288c2ff31c610846d69c00ae6b253c117b0b3 Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:05:16 +0300 Subject: [PATCH 01/11] feat(lazy): add support for LazyFile event See disucssion LazyVim/LazyVim#1583 --- nvim/.config/nvim/lua/config/lazy.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nvim/.config/nvim/lua/config/lazy.lua b/nvim/.config/nvim/lua/config/lazy.lua index b22e5da..9edcc57 100644 --- a/nvim/.config/nvim/lua/config/lazy.lua +++ b/nvim/.config/nvim/lua/config/lazy.lua @@ -19,6 +19,11 @@ vim.opt.rtp:prepend(lazypath) vim.g.mapleader = " " vim.g.maplocalleader = " " +-- Add support for the LazyFile event +local Event = require "lazy.core.handler.event" +Event.mappings.LazyFile = { id = "LazyFile", event = { "BufReadPost", "BufNewFile", "BufWritePre" } } +Event.mappings["User LazyFile"] = Event.mappings.LazyFile + -- Setup lazy.nvim require("lazy").setup { spec = { From 924d2d1f00f6d2f269a5f1117f22557fb8cb5a5e Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:06:22 +0300 Subject: [PATCH 02/11] style(auto-tags): update description --- nvim/.config/nvim/lua/plugins/auto-tags.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/.config/nvim/lua/plugins/auto-tags.lua b/nvim/.config/nvim/lua/plugins/auto-tags.lua index d910abb..9c49e62 100644 --- a/nvim/.config/nvim/lua/plugins/auto-tags.lua +++ b/nvim/.config/nvim/lua/plugins/auto-tags.lua @@ -1,5 +1,5 @@ return { - -- This is nice because it also autorenames html tags + -- Use treesitter to autoclose and autorename html tag "windwp/nvim-ts-autotag", event = "InsertEnter", opts = {}, From 3ce3eb6dfe5199144e882065c75b87bb9dcb309d Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:07:42 +0300 Subject: [PATCH 03/11] feat(blink): change event from "VimEnter" to "InsertEnter" --- nvim/.config/nvim/lua/plugins/blink.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/.config/nvim/lua/plugins/blink.lua b/nvim/.config/nvim/lua/plugins/blink.lua index 0b1750a..812311b 100644 --- a/nvim/.config/nvim/lua/plugins/blink.lua +++ b/nvim/.config/nvim/lua/plugins/blink.lua @@ -1,6 +1,6 @@ return { "saghen/blink.cmp", - event = "VimEnter", + event = "InsertEnter", version = "1.*", dependencies = { "rafamadriz/friendly-snippets", From 52dd868c8d8f2609b39f1eef4c05508d2edea245 Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:09:03 +0300 Subject: [PATCH 04/11] feat(colorizer): change event from "BufReadPre" to "LazyFile" --- nvim/.config/nvim/lua/plugins/colorizer.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/.config/nvim/lua/plugins/colorizer.lua b/nvim/.config/nvim/lua/plugins/colorizer.lua index 762a378..361b6df 100644 --- a/nvim/.config/nvim/lua/plugins/colorizer.lua +++ b/nvim/.config/nvim/lua/plugins/colorizer.lua @@ -1,6 +1,6 @@ return { "catgoose/nvim-colorizer.lua", - event = "BufReadPre", + event = "LazyFile", opts = { tailwind = true, tailwind_opts = { From 08d7edb3c9160d6a025943ee7e74c7ea4a10821d Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:09:30 +0300 Subject: [PATCH 05/11] feat(conform): change event from "BufWritePre" to "LazyFile" --- nvim/.config/nvim/lua/plugins/conform.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua index 3c6efa6..255cb79 100644 --- a/nvim/.config/nvim/lua/plugins/conform.lua +++ b/nvim/.config/nvim/lua/plugins/conform.lua @@ -1,6 +1,6 @@ return { "stevearc/conform.nvim", - event = { "BufWritePre" }, + event = "LazyFile", opts = { notify_on_error = true, format_on_save = { From 8d7c31f8197390533e253b0e52ac85130b52cda1 Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:09:54 +0300 Subject: [PATCH 06/11] feat(gitsigns): add event "LazyFile" --- nvim/.config/nvim/lua/plugins/gitsings.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/nvim/.config/nvim/lua/plugins/gitsings.lua b/nvim/.config/nvim/lua/plugins/gitsings.lua index 3905c1b..0706dec 100644 --- a/nvim/.config/nvim/lua/plugins/gitsings.lua +++ b/nvim/.config/nvim/lua/plugins/gitsings.lua @@ -1,5 +1,6 @@ return { "lewis6991/gitsigns.nvim", + event = "LazyFile", opts = { signs = { add = { text = "+" }, From 334217a05bdf05e2c5ff84672ca5845cc90473dd Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:10:38 +0300 Subject: [PATCH 07/11] feat(lsp): change event from "BufReadPre, BufNewFile" to "LazyFile" --- nvim/.config/nvim/lua/plugins/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index a4eb7b0..40e13c9 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -1,6 +1,6 @@ return { "neovim/nvim-lspconfig", - event = { "BufReadPre", "BufNewFile" }, + event = "LazyFile", dependencies = { { "mason-org/mason.nvim", cmd = "Mason", opts = {} }, -- Blink-based completion (no manual capabilities merge needed) From 8042768550e6da4ddbea79540d3553b5fecc6961 Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:14:43 +0300 Subject: [PATCH 08/11] chore(oil): add lazy=false to reduce ambiguity Does not add/change functionality to lazy loading but added to make it explicit that we do not want to lazy load this plugin --- nvim/.config/nvim/lua/plugins/oil.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/nvim/.config/nvim/lua/plugins/oil.lua b/nvim/.config/nvim/lua/plugins/oil.lua index 63d70f2..ec75456 100644 --- a/nvim/.config/nvim/lua/plugins/oil.lua +++ b/nvim/.config/nvim/lua/plugins/oil.lua @@ -2,6 +2,7 @@ return { { "stevearc/oil.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, + lazy = false, opts = { view_options = { show_hidden = true, From ae7bc851f5c9b3367ba56df7d292f580db7fb269 Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:19:02 +0300 Subject: [PATCH 09/11] refactor(tmux-navigator): remove unused VeryLazy and cmd events We lazy load the plugin with keys anyway, no need for separate event loading --- nvim/.config/nvim/lua/plugins/tmux-navigator.lua | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nvim/.config/nvim/lua/plugins/tmux-navigator.lua b/nvim/.config/nvim/lua/plugins/tmux-navigator.lua index f3cd92b..e99e8d3 100644 --- a/nvim/.config/nvim/lua/plugins/tmux-navigator.lua +++ b/nvim/.config/nvim/lua/plugins/tmux-navigator.lua @@ -1,13 +1,5 @@ return { "christoomey/vim-tmux-navigator", - event = "VeryLazy", - cmd = { - "TmuxNavigateLeft", - "TmuxNavigateDown", - "TmuxNavigateUp", - "TmuxNavigateRight", - "TmuxNavigatePrevious", - }, keys = { { "", "TmuxNavigateLeft" }, { "", "TmuxNavigateDown" }, From 7c360d948ac32883e4a810021b77f6e8a801c5c0 Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:20:02 +0300 Subject: [PATCH 10/11] feat(treesitter): add LazyFile event loading --- nvim/.config/nvim/lua/plugins/treesitter.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/nvim/.config/nvim/lua/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua index c38c19f..1157013 100644 --- a/nvim/.config/nvim/lua/plugins/treesitter.lua +++ b/nvim/.config/nvim/lua/plugins/treesitter.lua @@ -3,6 +3,7 @@ return { dependencies = { "nvim-treesitter/nvim-treesitter-textobjects", }, + event = "LazyFile", build = ":TSUpdate", main = "nvim-treesitter.configs", opts = { From b4d0e4b6aecea23b0b12535e540c4fb19f8d01aa Mon Sep 17 00:00:00 2001 From: oskarnurm <19738295+oskarnurm@users.noreply.github.com> Date: Fri, 25 Jul 2025 20:22:38 +0300 Subject: [PATCH 11/11] chore(init): require lazy last to ensure core settings load before plugins --- nvim/.config/nvim/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 38eb495..e5f7618 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,4 +1,4 @@ vim.loader.enable() require "config.options" -require "config.lazy" require "config.keymaps" +require "config.lazy"