diff --git a/.config/nvim/ftplugin/dockerfile.lua b/.config/nvim/ftplugin/dockerfile.lua
index ebc6690..6fc764c 100644
--- a/.config/nvim/ftplugin/dockerfile.lua
+++ b/.config/nvim/ftplugin/dockerfile.lua
@@ -2,7 +2,5 @@
 require'lspconfig'.dockerls.setup {}
 
 -- variables
-vim.o.shiftwidth = 2
-vim.o.tabstop = 2
 
 -- keybindings
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 3639483..689f596 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -32,6 +32,8 @@ vim.o.foldlevel      = 99
 vim.o.grepprg        = "grep -rn $*"
 vim.wo.cc            = "80"
 
+vim.cmd("au BufWrite * :%s/\\s\\+$//e")
+
 -- keybindings
 vim.keymap.set("t", "<Esc>", "<C-\\><C-n>")