diff --git a/nvim/.config/nvim/ftdetect/srec.lua b/nvim/.config/nvim/ftdetect/srec.lua
new file mode 100644
index 0000000..4b83b23
--- /dev/null
+++ b/nvim/.config/nvim/ftdetect/srec.lua
@@ -0,0 +1,7 @@
+vim.cmd([[
+  augroup SrecDetect
+    autocmd!
+    autocmd BufNewFile,BufRead *.sx,*.s19 set filetype=srec
+  augroup END
+]])
+
diff --git a/nvim/.config/nvim/ftdetect/vagrant.lua b/nvim/.config/nvim/ftdetect/vagrant.lua
new file mode 100644
index 0000000..7d8ba98
--- /dev/null
+++ b/nvim/.config/nvim/ftdetect/vagrant.lua
@@ -0,0 +1,7 @@
+vim.cmd([[
+  augroup VagrantDetect
+    autocmd!
+    autocmd BufNewFile,BufRead Vagrantfile set filetype=ruby
+  augroup END
+]])
+
diff --git a/nvim/.config/nvim/lua/fs/autocmds.lua b/nvim/.config/nvim/lua/fs/autocmds.lua
index 1dc4475..469ed8b 100644
--- a/nvim/.config/nvim/lua/fs/autocmds.lua
+++ b/nvim/.config/nvim/lua/fs/autocmds.lua
@@ -11,8 +11,6 @@ end
 
 make_autocmds {
   buffers = {
-    { 'BufNewFile,BufRead', '*.sx,*.s19', 'set filetype=srec' },
-    { 'BufNewFile,BufRead', 'Vagrantfile', 'set filetype=ruby' },
     -- Make it possible to use `gf` to jump to my configuration modules.
     { 'BufNewFile,BufRead', 'init.lua',
     "setlocal path+=~/.config/nvim/lua includeexpr=substitute(v:fname,'\\\\.','/','g')"},