diff --git a/config/nvim/lua/fschauen/autocmd.lua b/config/nvim/lua/fschauen/autocmd.lua
new file mode 100644
index 0000000..43afd2b
--- /dev/null
+++ b/config/nvim/lua/fschauen/autocmd.lua
@@ -0,0 +1,29 @@
+local M = {}
+
+M.setup = function()
+  local group = vim.api.nvim_create_augroup('fschauen', { clear = true } )
+
+  vim.api.nvim_create_autocmd('TextYankPost', {
+    desc = 'Briefly highlight yanked text.',
+    group = group,
+    pattern = '*',
+    callback = function(_) vim.highlight.on_yank() end
+  })
+
+  vim.api.nvim_create_autocmd('InsertEnter', {
+    desc = 'Hide cursor line when entering insert mode.',
+    group = group,
+    pattern = '*',
+    callback = function(_) vim.opt.cursorlineopt = 'number' end
+  })
+
+  vim.api.nvim_create_autocmd('InsertLeave', {
+    desc = 'Show cursor line when leaving insert mode.',
+    group = group,
+    pattern = '*',
+    callback = function(_) vim.opt.cursorlineopt = 'both' end
+  })
+end
+
+return M
+
diff --git a/config/nvim/lua/fschauen/init.lua b/config/nvim/lua/fschauen/init.lua
index 84ad330..cab8510 100644
--- a/config/nvim/lua/fschauen/init.lua
+++ b/config/nvim/lua/fschauen/init.lua
@@ -204,29 +204,7 @@ M.setup = function()
 
   require('fschauen.keymap').setup()
   require('fschauen.diagnostic').setup()
-
-  local group = vim.api.nvim_create_augroup('fschauen', { clear = true } )
-
-  vim.api.nvim_create_autocmd('TextYankPost', {
-    desc = 'Briefly highlight yanked text.',
-    group = group,
-    pattern = '*',
-    callback = function(_) vim.highlight.on_yank() end
-  })
-
-  vim.api.nvim_create_autocmd('InsertEnter', {
-    desc = 'Hide cursor line when entering insert mode.',
-    group = group,
-    pattern = '*',
-    callback = function(_) vim.opt.cursorlineopt = 'number' end
-  })
-
-  vim.api.nvim_create_autocmd('InsertLeave', {
-    desc = 'Show cursor line when leaving insert mode.',
-    group = group,
-    pattern = '*',
-    callback = function(_) vim.opt.cursorlineopt = 'both' end
-  })
+  require('fschauen.autocmd').setup()
 
   vim.filetype.add {
     pattern = {