3 files changed, 21 insertions, 2 deletions

diff --git a/nvim/ftplugin/c.vim b/nvim/ftplugin/c.vim
index e0c347d..fd45dbd 100644
--- a/nvim/ftplugin/c.vim
+++ b/nvim/ftplugin/c.vim
@@ -4,4 +4,5 @@ setlocal formatoptions=tcqr
 setlocal cindent
 
 setlocal foldenable
-setlocal foldmethod=syntax
+setlocal foldmethod=expr
+setlocal foldexpr=nvim_treesitter#foldexpr()
diff --git a/nvim/ftplugin/html.vim b/nvim/ftplugin/html.vim
index fced505..fe513b6 100644
--- a/nvim/ftplugin/html.vim
+++ b/nvim/ftplugin/html.vim
@@ -6,7 +6,8 @@ setlocal expandtab
 setlocal autoindent
 
 setlocal foldenable
-setlocal foldmethod=indent
+setlocal foldmethod=expr
+setlocal foldexpr=nvim_treesitter#foldexpr()
 
 let g:html_indent_script1='inc'
 let g:html_indent_style1='inc'
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index 4c0d9a0..1386eca 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -16,6 +16,7 @@ call plug#begin()
   Plug 'simnalamburt/vim-mundo'
   Plug 'tpope/vim-repeat'
   Plug 'tpope/vim-surround'
+  Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 call plug#end()
 
 " EMMET
@@ -48,3 +49,19 @@ let g:mundo_preview_height=30
 " Autopairs
 let b:autopairs_enabled=1
 
+" Treesitter
+lua << EOF
+require'nvim-treesitter.configs'.setup {
+  ensure_installed = { "c", "lua", "vim", "vimdoc", "typescript" },
+  sync_install = false,
+  auto_install = false,
+  highlight = {
+    enable = true,
+    disable = { "html" },
+    additional_vim_regex_highlighting = true,
+  },
+  indent = {
+    enable = false,
+  },
+}
+EOF