diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index e9414d0..9fe3a7b 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -63,6 +63,9 @@
 
       # show marks
       vim-signature
+
+      # Session management
+      auto-session
     ];
 
     extraConfig = ''
@@ -155,6 +158,10 @@
       let g:neoformat_enabled_python = ['black', 'isort']
 
       lua << EOF
+        require("auto-session").setup {
+          auto_save_enabled = true;
+          auto_restore_enabled = true;
+        }
         require("bufferline").setup{}
 
         require('lspconfig').gopls.setup{}