diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index 4237e8f..f784e94 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -99,6 +99,15 @@
         set undoreload=1000
       endif
 
+      " dont start with a fully folded document
+      set nofoldenable
+
+      " Remember cursor position
+      autocmd BufReadPost *
+       \ if line("'\"") > 0 && line("'\"") <= line("$") |
+       \   exe "normal! g`\"" |
+       \ endif
+
       " vim-go
       au FileType go nmap <leader>r <Plug>(go-run)
       au FileType go nmap <leader>b <Plug>(go-build)