diff --git a/configs/neovim.nix b/configs/neovim.nix
index b0c0724..7c17dfd 100644
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -8,6 +8,22 @@
   environment.shellAliases.vim = "nvim";
   environment.shellAliases.view = "nvim -R";
 
+  home-manager.users.me = {
+    editorconfig = {
+      enable = true;
+      settings = {
+        "*" = {
+          charset = "utf-8";
+          end_of_line = "lf";
+          trim_trailing_whitespace = true;
+          insert_final_newline = true;
+          indent_style = "space";
+          indent_size = 2;
+        };
+      };
+    };
+  };
+
   environment.systemPackages = [
     (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
     niveumPackages.vim
diff --git a/lib/vim/init.vim b/lib/vim/init.vim
index b0907ae..e2a0e82 100644
--- a/lib/vim/init.vim
+++ b/lib/vim/init.vim
@@ -38,19 +38,6 @@ set foldlevelstart=30
 
 nnoremap <C-H> <CMD>set nohlsearch<CR>
 
-fun! TrimWhitespace()
-  let l:save = winsaveview()
-  " remove trailing whitespace in lines
-  keeppatterns %s/\s\+$//e
-  " remove empty lines at file end
-  silent! %s#\($\n\s*\)\+\%$##
-  call winrestview(l:save)
-endfun
-command! TrimWhitespace call TrimWhitespace()
-autocmd BufWritePre * if !&binary && &ft !=# 'mail'
-      \|   call TrimWhitespace()
-      \| endif
-
 let g:netrw_banner=0
 let g:netrw_browse_split=4
 let g:netrw_altv=1 " open splits to the right
diff --git a/packages/vim.nix b/packages/vim.nix
index d89033c..4fdbadb 100644
--- a/packages/vim.nix
+++ b/packages/vim.nix
@@ -21,6 +21,8 @@
         cmp-cmdline
         luasnip
 
+        editorconfig-vim
+
         fzf-vim
         fzfWrapper
         supertab