diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 17bb5ea..2413627 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -74,6 +74,16 @@ vim.cmd [[
     set errorformat^=[----]\ %f:%l:\ %m
 ]]
 
+vim.o.backup = false
+vim.o.writebackup = false
+vim.o.swapfile = false
+vim.o.autoread = true
+vim.o.undofile = true
+vim.o.undodir = vim.fn.expand("~/.vim/neoundodir")
+if vim.fn.isdirectory(vim.o.undodir) == 0 then
+  vim.fn.mkdir(vim.o.undodir, "p")
+end
+
 vim.keymap.set('n', ',cf', function()
     local qf = vim.fn.getqflist()
     for i, item in ipairs(qf) do
diff --git a/vim/.vimrc b/vim/.vimrc
index 6e69c10..c3fde5f 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -42,6 +42,19 @@ nnoremap ,x <C-x>
 
 set autoindent
 set cursorline
+
+set nobackup
+set nowritebackup
+set noswapfile
+set autoread
+set undofile
+set undodir=~/.vim/undodir
+if !isdirectory(expand('~/.vim/undodir'))
+    call mkdir(expand('~/.vim/undodir'), 'p')
+endif
+
+set undodir=~/.vim/undodir
+set undofile
 set errorformat^=[----]\ %f:%l:\ %m
 set expandtab
 set exrc