diff --git a/vim/plugin/shame.vim b/vim/plugin/shame.vim
index 9e3eb09..ebebaeb 100644
--- a/vim/plugin/shame.vim
+++ b/vim/plugin/shame.vim
@@ -6,9 +6,6 @@
 
 " Sessions
 set sessionoptions=blank,buffers,curdir,folds,help,options,tabpages
-set foldmethod=marker
-
-set nocompatible
 
 " some conditional configs
 if has('mouse')
diff --git a/vimrc b/vimrc
index 9abe266..36863ae 100644
--- a/vimrc
+++ b/vimrc
@@ -9,6 +9,13 @@ if has("nvim")
 	lua pcall(require, "plugins")
 end
 
+set nocompatible
+
 au VimEnter * TSEnable highlight
 au VimEnter * TSEnable incremental_selection
 au VimEnter * TSEnable indent
+
+set foldlevel=99
+set foldlevelstart=99
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()