diff --git a/home/.config/nvim/rc/base.vim b/home/.config/nvim/rc/base.vim
index 070021f..799789e 100644
--- a/home/.config/nvim/rc/base.vim
+++ b/home/.config/nvim/rc/base.vim
@@ -17,6 +17,13 @@ set path+=**                    " Search down into subfolders with tab completio
 set wildmode=longest,list,full	" Enable autocompletion
 set wildmenu                    " Display all matching files when we tab complete
 
+" Folding
+set foldmethod=indent           " Use indent to determine the fold levels
+set foldnestmax=8               " Only fold up to given amount of levels
+set foldlevel=2                 " Set initial fold level
+set nofoldenable                " Hide all folds by default
+
+
 " Misc
 set autoindent					" Enable autoindent
 set autoread					" Reload files on change
diff --git a/home/.config/nvim/rc/mappings.vim b/home/.config/nvim/rc/mappings.vim
index 4931752..6ecbf83 100644
--- a/home/.config/nvim/rc/mappings.vim
+++ b/home/.config/nvim/rc/mappings.vim
@@ -14,6 +14,10 @@ vnoremap <C-v> "+p
 " Start spell-check
 map <leader>s :setlocal spell! spelllang=en_us<CR>
 
+" Use space for folding/unfolding sections
+nnoremap <space> za
+vnoremap <space> zf
+
 " Use shift to move 10 lines up/down quickly
 noremap <silent> K 10k
 noremap <silent> J 10j
@@ -58,3 +62,4 @@ nnoremap <A-c> :w \| !comp <c-r>%<CR>
 
 " Shell check
 nnoremap <leader>p :!shellcheck %<CR>
+