diff --git a/dot_config/nvim/after/ftplugin/java.lua b/dot_config/nvim/after/ftplugin/java.lua
index 88778a8..8b2d727 100644
--- a/dot_config/nvim/after/ftplugin/java.lua
+++ b/dot_config/nvim/after/ftplugin/java.lua
@@ -6,7 +6,7 @@ local workspace_dir = home .. '/.local/share/eclipse/' .. vim.fn.fnamemodify(roo
 local config = {
   cmd = {
     'jdtls',
-    '-data', workspace_dir
+    '-data', workspace_dir,
   },
   root_dir = require('jdtls.setup').find_root(root_markers),
   settings = {
@@ -14,12 +14,13 @@ local config = {
   },
   init_options = {
     bundles = {
-      require('mason-core.path').package_prefix('java-debug-adapter')..'/extension/server/com.microsoft.java.debug.plugin-0.46.0.jar',
+      require('mason-core.path').package_prefix('java-debug-adapter') ..
+      '/extension/server/com.microsoft.java.debug.plugin-0.46.0.jar',
     },
   },
-  on_attach = function(client, buf)
+  on_attach = function()
     local jdtls = require('jdtls')
-    jdtls.setup_dap({ hotcodereplace = 'auto' })
+    jdtls.setup_dap({ hotcodereplace = 'auto', config_overrides = {} })
   end,
 }
 require('jdtls').start_or_attach(config)
diff --git a/dot_config/nvim/after/ftplugin/nix.vim b/dot_config/nvim/after/ftplugin/nix.vim
new file mode 100644
index 0000000..1b4c30f
--- /dev/null
+++ b/dot_config/nvim/after/ftplugin/nix.vim
@@ -0,0 +1 @@
+setlocal tabstop=2 shiftwidth=2
diff --git a/dot_config/nvim/ftdetect/dotnet.vim b/dot_config/nvim/ftdetect/dotnet.vim
deleted file mode 100644
index 84b428c..0000000
--- a/dot_config/nvim/ftdetect/dotnet.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-autocmd BufRead,BufNewFile Directory.Build.props set ft=xml
-autocmd BufRead,BufNewFile Directory.Build.targets set ft=xml
-autocmd BufRead,BufNewFile *.axaml set ft=xml
-autocmd BufRead,BufNewFile *.xaml set ft=xml
-autocmd BufRead,BufNewFile *.cake set filetype=cs
diff --git a/dot_config/nvim/ftdetect/env.vim b/dot_config/nvim/ftdetect/env.vim
deleted file mode 100644
index becfa11..0000000
--- a/dot_config/nvim/ftdetect/env.vim
+++ /dev/null
@@ -1 +0,0 @@
-autocmd BufRead,BufNewFile *.env set ft=env
diff --git a/dot_config/nvim/ftdetect/nette.vim b/dot_config/nvim/ftdetect/nette.vim
deleted file mode 100644
index dc2bafb..0000000
--- a/dot_config/nvim/ftdetect/nette.vim
+++ /dev/null
@@ -1 +0,0 @@
-autocmd BufRead,BufNewFile *.tpl setlocal filetype=html.latte
diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua
index 341e81b..bc798e1 100644
--- a/dot_config/nvim/init.lua
+++ b/dot_config/nvim/init.lua
@@ -27,3 +27,4 @@ require('lazy').setup(
 
 require('configs.misc').setup()
 require('configs.keys').setup()
+require('configs.filetypes').setup()
diff --git a/dot_config/nvim/lua/configs/filetypes.lua b/dot_config/nvim/lua/configs/filetypes.lua
new file mode 100644
index 0000000..8f2dde6
--- /dev/null
+++ b/dot_config/nvim/lua/configs/filetypes.lua
@@ -0,0 +1,21 @@
+local M = {}
+
+function M.setup()
+  vim.filetype.add({
+    extension = {
+      templ = 'templ',
+      env = 'env',
+      tpl = 'html.latte',
+
+      axaml = 'xml',
+      xaml = 'xml',
+      cake = 'cs'
+    },
+    filename = {
+      ['Directory.Build.props'] = 'xml',
+      ['Directory.Build.targets'] = 'xml',
+    }
+  })
+end
+
+return M