diff --git a/nvim/after/ftplugin/go.lua b/nvim/after/ftplugin/go.lua
new file mode 100644
index 0000000..19f88d3
--- /dev/null
+++ b/nvim/after/ftplugin/go.lua
@@ -0,0 +1,4 @@
+vim.opt_local.tabstop = 8
+vim.opt_local.shiftwidth = 8
+vim.opt_local.softtabstop = 8
+vim.opt_local.expandtab = false
diff --git a/nvim/after/ftplugin/lua.lua b/nvim/after/ftplugin/lua.lua
new file mode 100644
index 0000000..db9b490
--- /dev/null
+++ b/nvim/after/ftplugin/lua.lua
@@ -0,0 +1,3 @@
+vim.opt_local.tabstop = 4
+vim.opt_local.shiftwidth = 4
+vim.opt_local.softtabstop = 4
diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua
index 1aded1f..7659482 100644
--- a/nvim/lua/config/autocmds.lua
+++ b/nvim/lua/config/autocmds.lua
@@ -24,25 +24,6 @@ if vim.env.TMUX then
     hide()
 end
 
-vim.api.nvim_create_autocmd("FileType", {
-    pattern = "go",
-    callback = function()
-        vim.opt_local.tabstop = 8
-        vim.opt_local.shiftwidth = 8
-        vim.opt_local.softtabstop = 8
-        vim.opt_local.expandtab = false
-    end,
-})
-
-vim.api.nvim_create_autocmd("FileType", {
-    pattern = "lua",
-    callback = function()
-        vim.opt_local.tabstop = 4
-        vim.opt_local.shiftwidth = 4
-        vim.opt_local.softtabstop = 4
-    end,
-})
-
 vim.api.nvim_create_autocmd("TextYankPost", {
     callback = function()
         vim.hl.on_yank({ timeout = 200 })