Fix error caused by upgrade of nvim-treesitterHEADmaster

5 files changed, 13 insertions, 17 deletions

diff --git a/.config/nvim/ftplugin/lua.lua b/.config/nvim/ftplugin/lua.lua
new file mode 100644
index 0000000..84afdd8
--- /dev/null
+++ b/.config/nvim/ftplugin/lua.lua
@@ -0,0 +1,4 @@
+require('nvim-treesitter').install{ 'lua' }
+vim.treesitter.start()
+vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+vim.wo[0][0].foldmethod = 'expr'
diff --git a/.config/nvim/ftplugin/markdown.lua b/.config/nvim/ftplugin/markdown.lua
new file mode 100644
index 0000000..82ac243
--- /dev/null
+++ b/.config/nvim/ftplugin/markdown.lua
@@ -0,0 +1,4 @@
+require('nvim-treesitter').install{ 'markdown' }
+vim.treesitter.start()
+vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+vim.wo[0][0].foldmethod = 'expr'
diff --git a/.config/nvim/ftplugin/rust.lua b/.config/nvim/ftplugin/rust.lua
new file mode 100644
index 0000000..7634a86
--- /dev/null
+++ b/.config/nvim/ftplugin/rust.lua
@@ -0,0 +1,4 @@
+require('nvim-treesitter').install{ 'rust' }
+vim.treesitter.start()
+vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+vim.wo[0][0].foldmethod = 'expr'
diff --git a/.config/nvim/plugin-settings/nvim-treesitter.lua b/.config/nvim/plugin-settings/nvim-treesitter.lua
index 4afe91e..2fd60d2 100644
--- a/.config/nvim/plugin-settings/nvim-treesitter.lua
+++ b/.config/nvim/plugin-settings/nvim-treesitter.lua
@@ -1,13 +1 @@
-require("nvim-treesitter.configs").setup({
-  -- A list of parser names, or "all" (the four listed parsers should always be installed)
-  ensure_installed = { "c", "lua", "vim" },
-  ignore_install = { "org" },
-
-  -- Automatically install missing parsers when entering buffer
-  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
-  auto_install = true,
-
-  highlight = {
-    enable = true,
-  },
-})
+require('nvim-treesitter').install({ 'c', 'lua', 'markdown', 'vim' }):wait(300000) -- wait max. 5 minutes
diff --git a/.config/nvim/regular.vim b/.config/nvim/regular.vim
index ff7b720..8bd792e 100644
--- a/.config/nvim/regular.vim
+++ b/.config/nvim/regular.vim
@@ -38,10 +38,6 @@ set noarabicshape
 set keymap=arabic
 set iminsert=0
 
-" Folding based on treesitter
-set foldmethod=expr
-set foldexpr=nvim_treesitter#foldexpr()
-
 " Disable mouse.
 set mouse=