diff --git a/neovim/.config/nvim/after/ftplugin/fugitive.lua b/neovim/.config/nvim/after/ftplugin/fugitive.lua
new file mode 100644
index 0000000..7ad793b
--- /dev/null
+++ b/neovim/.config/nvim/after/ftplugin/fugitive.lua
@@ -0,0 +1 @@
+vim.wo.colorcolumn = ""
diff --git a/neovim/.config/nvim/after/ftplugin/gitcommit.lua b/neovim/.config/nvim/after/ftplugin/gitcommit.lua
new file mode 100644
index 0000000..afc83c6
--- /dev/null
+++ b/neovim/.config/nvim/after/ftplugin/gitcommit.lua
@@ -0,0 +1,2 @@
+vim.wo.colorcolumn = "50"
+vim.cmd("setlocal spell")
diff --git a/neovim/.config/nvim/after/plugin/aus.lua b/neovim/.config/nvim/after/plugin/aus.lua
index e3c9d5d..e68f325 100644
--- a/neovim/.config/nvim/after/plugin/aus.lua
+++ b/neovim/.config/nvim/after/plugin/aus.lua
@@ -16,23 +16,6 @@ vim.api.nvim_create_autocmd("BufEnter", {
   end,
 })
 
-vim.api.nvim_create_autocmd("BufEnter", {
-  pattern = "*",
-  group = group,
-  callback = function()
-    local ft = vim.bo.filetype
-
-    if ft == "fugitive" then
-      vim.wo.colorcolumn = ""
-    end
-
-    if ft == "gitcommit" then
-      vim.wo.colorcolumn = "50"
-      vim.cmd("setlocal spell")
-    end
-  end,
-})
-
 local function open_nvim_tree(data)
   -- buffer is a directory
   local directory = vim.fn.isdirectory(data.file) == 1