diff --git a/homeManagerModules/neovim/langs/bash/default.nix b/homeManagerModules/neovim/langs/bash/default.nix
index 302e753d..40339c05 100644
--- a/homeManagerModules/neovim/langs/bash/default.nix
+++ b/homeManagerModules/neovim/langs/bash/default.nix
@@ -37,7 +37,7 @@ in {
         extraLuaConfig =
           # lua
           ''
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = 'sh',
                 command = 'setlocal ts=4 sw=4 sts=0 expandtab',
             });
diff --git a/homeManagerModules/neovim/langs/c-lang/default.nix b/homeManagerModules/neovim/langs/c-lang/default.nix
index 46f33e3f..006beb58 100644
--- a/homeManagerModules/neovim/langs/c-lang/default.nix
+++ b/homeManagerModules/neovim/langs/c-lang/default.nix
@@ -15,7 +15,7 @@ in {
         extraLuaConfig =
           # lua
           ''
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = { 'cpp', 'c' },
 
                 callback = function()
diff --git a/homeManagerModules/neovim/langs/csharp/default.nix b/homeManagerModules/neovim/langs/csharp/default.nix
index 87727012..05a0b1e5 100644
--- a/homeManagerModules/neovim/langs/csharp/default.nix
+++ b/homeManagerModules/neovim/langs/csharp/default.nix
@@ -61,7 +61,7 @@ in {
                     });
                 end;
 
-                vim.api.nvim_create_autocmd('FileType', {
+                vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                     pattern = { 'cs' },
 
                     callback = function()
diff --git a/homeManagerModules/neovim/langs/hyprlang/default.nix b/homeManagerModules/neovim/langs/hyprlang/default.nix
index 95b68a07..24df0f66 100644
--- a/homeManagerModules/neovim/langs/hyprlang/default.nix
+++ b/homeManagerModules/neovim/langs/hyprlang/default.nix
@@ -17,7 +17,7 @@ in {
                 pattern = { [ '.*/hypr/.*%.conf' ] = 'hyprlang' },
             });
 
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                pattern = 'hyprlang',
                command = 'setlocal ts=4 sw=4 sts=0 expandtab',
             });
diff --git a/homeManagerModules/neovim/langs/java/default.nix b/homeManagerModules/neovim/langs/java/default.nix
index 22711f80..3da9abc1 100644
--- a/homeManagerModules/neovim/langs/java/default.nix
+++ b/homeManagerModules/neovim/langs/java/default.nix
@@ -22,7 +22,7 @@ in {
         extraLuaConfig =
           # lua
           ''
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                pattern = 'java',
                command = 'setlocal ts=4 sw=4 sts=0 expandtab',
             });
@@ -63,7 +63,7 @@ in {
                     require('jdtls').start_or_attach(config);
                 end
 
-                vim.api.nvim_create_autocmd('FileType', {
+                vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                     pattern = 'java',
                     callback = startJdtls,
                 });
diff --git a/homeManagerModules/neovim/langs/json/default.nix b/homeManagerModules/neovim/langs/json/default.nix
index 5e24128c..d0038d19 100644
--- a/homeManagerModules/neovim/langs/json/default.nix
+++ b/homeManagerModules/neovim/langs/json/default.nix
@@ -14,7 +14,7 @@ in {
         extraLuaConfig =
           # lua
           ''
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = { 'json', 'yaml', '.clang-.*' },
 
                 callback = function()
diff --git a/homeManagerModules/neovim/langs/kotlin/default.nix b/homeManagerModules/neovim/langs/kotlin/default.nix
index dd94dff1..4a048882 100644
--- a/homeManagerModules/neovim/langs/kotlin/default.nix
+++ b/homeManagerModules/neovim/langs/kotlin/default.nix
@@ -14,7 +14,7 @@ in {
         extraLuaConfig =
           # lua
           ''
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = { 'kotlin' },
 
                 callback = function()
diff --git a/homeManagerModules/neovim/langs/lua/default.nix b/homeManagerModules/neovim/langs/lua/default.nix
index 1258b006..09662361 100644
--- a/homeManagerModules/neovim/langs/lua/default.nix
+++ b/homeManagerModules/neovim/langs/lua/default.nix
@@ -22,7 +22,7 @@ in {
               ''
                 local default_capabilities = require('cmp_nvim_lsp').default_capabilities();
 
-                vim.api.nvim_create_autocmd('FileType', {
+                vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                     pattern = 'lua',
 
                     callback = function()
diff --git a/homeManagerModules/neovim/langs/markdown/default.nix b/homeManagerModules/neovim/langs/markdown/default.nix
index bb9798bf..8a97cbc1 100644
--- a/homeManagerModules/neovim/langs/markdown/default.nix
+++ b/homeManagerModules/neovim/langs/markdown/default.nix
@@ -27,7 +27,7 @@ in {
         extraLuaConfig =
           # lua
           ''
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = { 'markdown', 'tex' },
 
                 callback = function()
diff --git a/homeManagerModules/neovim/langs/qml/default.nix b/homeManagerModules/neovim/langs/qml/default.nix
index 3407246e..c173ac22 100644
--- a/homeManagerModules/neovim/langs/qml/default.nix
+++ b/homeManagerModules/neovim/langs/qml/default.nix
@@ -14,7 +14,7 @@ in {
         extraLuaConfig =
           # lua
           ''
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = { 'qml' },
 
                 callback = function()
diff --git a/homeManagerModules/neovim/langs/rust/default.nix b/homeManagerModules/neovim/langs/rust/default.nix
index afd69a3a..d59047f6 100644
--- a/homeManagerModules/neovim/langs/rust/default.nix
+++ b/homeManagerModules/neovim/langs/rust/default.nix
@@ -14,7 +14,7 @@ in {
         extraLuaConfig =
           # lua
           ''
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = { 'rust' },
 
                 callback = function()
diff --git a/homeManagerModules/neovim/langs/web/default.nix b/homeManagerModules/neovim/langs/web/default.nix
index 6bd9882a..3127ab8e 100644
--- a/homeManagerModules/neovim/langs/web/default.nix
+++ b/homeManagerModules/neovim/langs/web/default.nix
@@ -34,7 +34,7 @@ in {
                 end
             end;
 
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = { 'javascript', 'javascriptreact', 'javascript.jsx', 'typescript', 'typescriptreact', 'typescript.tsx', 'css', 'scss' },
 
                 callback = function()
@@ -44,7 +44,7 @@ in {
                 end,
             });
 
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = 'html',
 
                 callback = function()
@@ -54,7 +54,7 @@ in {
                 end,
             });
 
-            vim.api.nvim_create_autocmd('FileType', {
+            vim.api.nvim_create_autocmd({ 'FileType', 'BufEnter' }, {
                 pattern = 'scss',
                 command = 'setlocal iskeyword+=@-@',
             });