14 files changed, 11 insertions, 17 deletions

diff --git a/nvim/.config/nvim/after/ftplugin/PKGBUILD.lua b/nvim/.config/nvim/after/ftplugin/PKGBUILD.lua
index c664d72..3c844d9 100644
--- a/nvim/.config/nvim/after/ftplugin/PKGBUILD.lua
+++ b/nvim/.config/nvim/after/ftplugin/PKGBUILD.lua
@@ -1,2 +1 @@
 vim.opt_local.tabstop = 2
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/after/ftplugin/c.lua b/nvim/.config/nvim/after/ftplugin/c.lua
index c664d72..3c844d9 100644
--- a/nvim/.config/nvim/after/ftplugin/c.lua
+++ b/nvim/.config/nvim/after/ftplugin/c.lua
@@ -1,2 +1 @@
 vim.opt_local.tabstop = 2
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/after/ftplugin/css.lua b/nvim/.config/nvim/after/ftplugin/css.lua
index c664d72..3c844d9 100644
--- a/nvim/.config/nvim/after/ftplugin/css.lua
+++ b/nvim/.config/nvim/after/ftplugin/css.lua
@@ -1,2 +1 @@
 vim.opt_local.tabstop = 2
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/after/ftplugin/html.lua b/nvim/.config/nvim/after/ftplugin/html.lua
index c664d72..3c844d9 100644
--- a/nvim/.config/nvim/after/ftplugin/html.lua
+++ b/nvim/.config/nvim/after/ftplugin/html.lua
@@ -1,2 +1 @@
 vim.opt_local.tabstop = 2
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/after/ftplugin/htmldjango.lua b/nvim/.config/nvim/after/ftplugin/htmldjango.lua
index 9b09cd6..e1ef341 100644
--- a/nvim/.config/nvim/after/ftplugin/htmldjango.lua
+++ b/nvim/.config/nvim/after/ftplugin/htmldjango.lua
@@ -1,3 +1,2 @@
----@diagnostic disable-next-line: param-type-mismatch
-vim.opt_local.formatoptions:remove("o")
-vim.opt_local.tabstop = 2
+vim.cmd.runtime("ftplugin/html.lua", { bang = true })
+vim.cmd.runtime("ftplugin/django.lua", { bang = true })
diff --git a/nvim/.config/nvim/after/ftplugin/javascript.lua b/nvim/.config/nvim/after/ftplugin/javascript.lua
index c664d72..3c844d9 100644
--- a/nvim/.config/nvim/after/ftplugin/javascript.lua
+++ b/nvim/.config/nvim/after/ftplugin/javascript.lua
@@ -1,2 +1 @@
 vim.opt_local.tabstop = 2
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/after/ftplugin/lua.lua b/nvim/.config/nvim/after/ftplugin/lua.lua
index 9b09cd6..3c844d9 100644
--- a/nvim/.config/nvim/after/ftplugin/lua.lua
+++ b/nvim/.config/nvim/after/ftplugin/lua.lua
@@ -1,3 +1 @@
----@diagnostic disable-next-line: param-type-mismatch
-vim.opt_local.formatoptions:remove("o")
 vim.opt_local.tabstop = 2
diff --git a/nvim/.config/nvim/after/ftplugin/markdown.lua b/nvim/.config/nvim/after/ftplugin/markdown.lua
index 4547d08..97209fb 100644
--- a/nvim/.config/nvim/after/ftplugin/markdown.lua
+++ b/nvim/.config/nvim/after/ftplugin/markdown.lua
@@ -1,3 +1 @@
 vim.opt_local.textwidth = 80
-vim.opt_local.shiftwidth = 2
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/after/ftplugin/qf.lua b/nvim/.config/nvim/after/ftplugin/qf.lua
index 869505d..a5e6ed9 100644
--- a/nvim/.config/nvim/after/ftplugin/qf.lua
+++ b/nvim/.config/nvim/after/ftplugin/qf.lua
@@ -1 +1 @@
-vim.wo[0][0].scrolloff = 0
+vim.opt_local.scrolloff = 0
diff --git a/nvim/.config/nvim/after/ftplugin/rust.lua b/nvim/.config/nvim/after/ftplugin/rust.lua
deleted file mode 100644
index 17304d6..0000000
--- a/nvim/.config/nvim/after/ftplugin/rust.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/after/ftplugin/sh.lua b/nvim/.config/nvim/after/ftplugin/sh.lua
index c664d72..3c844d9 100644
--- a/nvim/.config/nvim/after/ftplugin/sh.lua
+++ b/nvim/.config/nvim/after/ftplugin/sh.lua
@@ -1,2 +1 @@
 vim.opt_local.tabstop = 2
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/after/ftplugin/typescript.lua b/nvim/.config/nvim/after/ftplugin/typescript.lua
deleted file mode 100644
index 17304d6..0000000
--- a/nvim/.config/nvim/after/ftplugin/typescript.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/after/ftplugin/zsh.lua b/nvim/.config/nvim/after/ftplugin/zsh.lua
index c664d72..3c844d9 100644
--- a/nvim/.config/nvim/after/ftplugin/zsh.lua
+++ b/nvim/.config/nvim/after/ftplugin/zsh.lua
@@ -1,2 +1 @@
 vim.opt_local.tabstop = 2
-vim.opt_local.formatoptions:remove("o")
diff --git a/nvim/.config/nvim/lua/tobyvin/options.lua b/nvim/.config/nvim/lua/tobyvin/options.lua
index 2cba330..cf9f205 100644
--- a/nvim/.config/nvim/lua/tobyvin/options.lua
+++ b/nvim/.config/nvim/lua/tobyvin/options.lua
@@ -47,3 +47,11 @@ vim.opt.updatetime = 500
 vim.opt.wildignore:append({ "*.o", "*.rej", "*.so", "*~", "*.pyc", "*pycache*", "Cargo.lock" })
 vim.opt.wildmode = "longest:full,full"
 vim.opt.wrap = false
+
+vim.api.nvim_create_autocmd("FileType", {
+	group = vim.api.nvim_create_augroup("options", { clear = true }),
+	callback = function()
+		---@diagnostic disable-next-line: param-type-mismatch
+		vim.opt_local.formatoptions:remove("o")
+	end,
+})