diff --git a/nix/progs/nvim/lua/plugins.lua b/nix/progs/nvim/lua/plugins.lua
index 3551ea7..3362405 100644
--- a/nix/progs/nvim/lua/plugins.lua
+++ b/nix/progs/nvim/lua/plugins.lua
@@ -33,12 +33,27 @@ vim.g.neoformat_try_node_exe = 1
 vim.g.neoformat_only_msg_on_error = 1
 vim.g.neoformat_enabled_markdown = {"denofmt"}
 
+vim.cmd [[
+aug fmt
+  au!
+  au BufWritePre * try | undojoin | Neoformat | catch /E790/ | Neoformat | endtry
+aug END
+]]
+--[[ TODO: need to investigate how implement it in lua
 local format_augroup = vim.api.nvim_create_augroup('format', {})
 vim.api.nvim_create_autocmd('BufWritePre', {
   pattern = '*',
   group = spell_check_augroup,
-  callback = 'try | undojoin | NeoFormat | catch /E790/ | NeoFormat | endtry'
+  callback = function ()
+    local ok, _ = pcall(function ()
+      vim.fn.undojoin();
+      vim.cmd'NeoFormat';
+    end)
+
+    if not ok then vim.cmd'NeoFormat' end
+  end
 })
+]]--
 
 -------------------------------------------------------------------------------
 --