From e05d7658fb4761c9baaabc4b8c44837c1adf71d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20Barta?= <tamas@bartatamas.hu>
Date: Sun, 29 Jan 2023 19:41:28 +0100
Subject: [PATCH] fix(config): add groups to autocommands, and fix plugin/user
 config order

---
 lua/lazyvim/config/autocmds.lua | 10 ++++++++++
 lua/lazyvim/config/init.lua     |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lua/lazyvim/config/autocmds.lua b/lua/lazyvim/config/autocmds.lua
index e8e23662..5d57bce3 100644
--- a/lua/lazyvim/config/autocmds.lua
+++ b/lua/lazyvim/config/autocmds.lua
@@ -4,20 +4,25 @@
 vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, { command = "checktime" })
 
 -- Highlight on yank
+vim.api.nvim_create_augroup("_lazy_vim_highlight_on_yank", {})
 vim.api.nvim_create_autocmd("TextYankPost", {
   callback = function()
     vim.highlight.on_yank()
   end,
+  group = "_lazy_vim_highlight_on_yank",
 })
 
 -- resize splits if window got resized
+vim.api.nvim_create_augroup("_lazy_vim_resize_splits", {})
 vim.api.nvim_create_autocmd({ "VimResized" }, {
   callback = function()
     vim.cmd("tabdo wincmd =")
   end,
+  group = "_lazy_vim_resize_splits",
 })
 
 -- go to last loc when opening a buffer
+vim.api.nvim_create_augroup("_lazy_vim_go_to_last_loc_when_opening_a_buffer", {})
 vim.api.nvim_create_autocmd("BufReadPost", {
   callback = function()
     local mark = vim.api.nvim_buf_get_mark(0, '"')
@@ -26,9 +31,11 @@ vim.api.nvim_create_autocmd("BufReadPost", {
       pcall(vim.api.nvim_win_set_cursor, 0, mark)
     end
   end,
+  group = "_lazy_vim_go_to_last_loc_when_opening_a_buffer",
 })
 
 -- close some filetypes with <q>
+vim.api.nvim_create_augroup("_lazy_vim_close_some_filetypes_with_q", {})
 vim.api.nvim_create_autocmd("FileType", {
   pattern = {
     "qf",
@@ -45,8 +52,11 @@ vim.api.nvim_create_autocmd("FileType", {
     vim.bo[event.buf].buflisted = false
     vim.keymap.set("n", "q", "<cmd>close<cr>", { buffer = event.buf, silent = true })
   end,
+  group = "_lazy_vim_close_some_filetypes_with_q",
 })
 
+-- wrap and check for spell in text filetypes
+vim.api.nvim_create_augroup("_lazy_vim_wrap_and_spell_check_text_filetypes", {})
 vim.api.nvim_create_autocmd("FileType", {
   pattern = { "gitcommit", "markdown" },
   callback = function()
diff --git a/lua/lazyvim/config/init.lua b/lua/lazyvim/config/init.lua
index 74919568..5883b685 100644
--- a/lua/lazyvim/config/init.lua
+++ b/lua/lazyvim/config/init.lua
@@ -119,8 +119,7 @@ end
 ---@param name "autocmds" | "options" | "keymaps"
 function M.load(name)
   local Util = require("lazy.core.util")
-  -- always load lazyvim, then user file
-  for _, mod in ipairs({ "lazyvim.config." .. name, "config." .. name }) do
+  local try_load = function(mod)
     Util.try(function()
       require(mod)
     end, {
@@ -133,6 +132,9 @@ function M.load(name)
       end,
     })
   end
+  -- always load lazyvim, then user file
+  try_load("lazyvim.config." .. name)
+  try_load("config." .. name)
   if vim.bo.filetype == "lazy" then
     -- HACK: LazyVim may have overwritten options of the Lazy ui, so reset this here
     vim.cmd([[do VimResized]])