diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua index 755fbe39..74919568 100644 --- a/lua/lazyvim/config/init.lua +++ b/lua/lazyvim/config/init.lua @@ -76,9 +76,10 @@ function M.setup(opts) .. "Please upgrade **lazy.nvim**", { title = "LazyVim" } ) + error("Exiting") end - if vim.fn.argc() == 0 then + if vim.fn.argc(-1) == 0 then -- autocmds and keymaps can wait to load vim.api.nvim_create_autocmd("User", { group = vim.api.nvim_create_augroup("LazyVim", { clear = true }), diff --git a/lua/lazyvim/plugins/core.lua b/lua/lazyvim/plugins/core.lua index fd211ff5..47a4773f 100644 --- a/lua/lazyvim/plugins/core.lua +++ b/lua/lazyvim/plugins/core.lua @@ -1,8 +1,4 @@ --- only add for >=9.0.1, since there's an endless loop in earlier versions -if not require("lazyvim.config").has(">=9.1.0") then - require("lazyvim.config").setup() - return {} -end +require("lazyvim.config").init() return { { "folke/lazy.nvim", version = "*" }, diff --git a/lua/lazyvim/plugins/init.lua b/lua/lazyvim/plugins/init.lua deleted file mode 100644 index 9d004d60..00000000 --- a/lua/lazyvim/plugins/init.lua +++ /dev/null @@ -1,3 +0,0 @@ -require("lazyvim.config").init() - -return {}