nvim: fix autocmds

.config/nvim/lua/coding.lua

@@ -18,14 +18,18 @@ packer.use {
     map('n', '<Leader>g', ':Neogit<cr>')
 }
 
-vim.api.nvim_create_autocmd('FileType', {
+vim.api.nvim_create_augroup('config_coding', { clear = true })
-    pattern = { 'gitcommit', 'gitrebase' },
+vim.api.nvim_create_autocmd(
-    callback = function()
+    { 'FileType' },
-        -- FIXME: why does the autocmd in settings.lua not set it?
+    {
-        vim.wo.colorcolumn = tostring(vim.o.textwidth)
+        group = 'config_coding',
-        vim.cmd([[startinsert | 1]])
+        pattern = { 'gitcommit', 'gitrebase' },
-    end
+        callback = function()
-})
+            -- FIXME: why does the autocmd in settings.lua not set it?
+            vim.wo.colorcolumn = tostring(vim.o.textwidth)
+            vim.cmd([[startinsert | 1]])
+        end
+    })
 
 packer.use {
     'https://github.com/gentoo/gentoo-syntax',

.config/nvim/lua/functions.lua

@@ -5,9 +5,11 @@ function my_remove_trailing_whitespace()
     vim.api.nvim_win_set_cursor(0, curpos)
 end
 
+vim.api.nvim_create_augroup('config_functions', { clear = true })
 vim.api.nvim_create_autocmd(
     { 'BufWritePre' },
     {
+        group = 'config_functions',
         pattern = {
             '*.lua', '*.cpp', '*.hpp'
         },

.config/nvim/lua/lsp.lua

@@ -56,21 +56,6 @@ packer.use {
                     callback = vim.lsp.buf.clear_references,
                 })
             end
-
-            vim.api.nvim_create_autocmd("CursorHold", {
-                buffer = bufnr,
-                callback = function()
-                    local opts = {
-                        focusable = false,
-                        close_events = { "BufLeave", "CursorMoved", "InsertEnter", "FocusLost" },
-                        border = 'rounded',
-                        source = 'always',
-                        prefix = ' ',
-                        scope = 'cursor',
-                    }
-                    vim.diagnostic.open_float(nil, opts)
-                end
-            })
         end
 
         -- setup servers

.config/nvim/lua/plugins.lua

@@ -36,7 +36,12 @@ vim.api.nvim_create_autocmd(
         callback = function()
             -- exclude plugins.lua, because that would re-init packer
             if (not vim.api.nvim_buf_get_name(0):match('plugins.lua$')) then
-                vim.cmd([[source <afile> | PackerInstall]])
+                vim.cmd([[
+                    echo 'reloading config file…'
+                    source <afile>
+                    PackerInstall
+                    redraw
+                ]])
             end
         end
     }

.config/nvim/lua/settings.lua

@@ -28,9 +28,11 @@ packer.use {
 packer.use 'https://github.com/editorconfig/editorconfig-vim'
 
 -- set colorcolumn to textwidth after buffer is displayed or option is changed
+vim.api.nvim_create_augroup('config_settings', { clear = true })
 vim.api.nvim_create_autocmd(
     { 'BufWinEnter', 'OptionSet' },
     {
+        group = 'config_settings',
         pattern = { 'textwidth' },
         callback = function()
             if vim.o.textwidth > 0 then