Treesitter vs. polyglot + fixes

install/3_vimux.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 
-brew install neovim
+brew install neovim --HEAD
 brew install tmux
 
 # vim dependencies
@@ -18,5 +18,6 @@ sh -c 'curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.gith
 
 vim +PlugInstall
 vim +CocInstall\ coc-calc\ coc-css\ coc-eslint\ coc-html\ coc-json\ coc-markdownlint\ coc-pairs\ coc-phpls\ coc-snippets\ coc-stylelintplus\ coc-tsserver\ coc-yaml\ coc-yank
-vim +CocUpdate +PlugUpgrade +PlugUpdate
+vim +TSInstall\ javascript\ typescript\ tsx\ vue\ yaml\ html\ json\ jsonc\ jsdoc\ php\ css\ regex\ comment
+vim +CocUpdate +PlugUpgrade +PlugUpdate +TSUpdate
 vim +checkhealth

nvim/config.vim

@@ -8,8 +8,9 @@ set fileformat=unix
 set fillchars=
 set foldignore=
 set foldlevelstart=1 " deactivate folding on fileload
-set foldmethod=indent " indent folding
 set foldnestmax=20 " max 20 levels of folding
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
 set gdefault
 set grepprg=ag " use ag for grepping
 set hidden
@@ -50,5 +51,5 @@ set wrapscan
 set background=dark
 set termguicolors
 let g:gruvbox_italic=1
-autocmd vimenter * ++nested colorscheme gruvbox
+colorscheme gruvbox
 language en_US.UTF-8

nvim/init.vim

@@ -7,9 +7,10 @@ Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'junegunn/gv.vim'
 Plug 'mcchrish/nnn.vim'
-Plug 'morhetz/gruvbox'
 Plug 'neoclide/coc.nvim', { 'branch': 'release' }
-Plug 'sheerun/vim-polyglot'
+Plug 'npxbr/gruvbox.nvim'
+Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
+Plug 'rktjmp/lush.nvim' " for gruvbox.nvim
 Plug 'tpope/vim-apathy'
 Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-eunuch'

nvim/plugins.vim

@@ -1,3 +1,15 @@
+" treesitter
+lua <<EOF
+require'nvim-treesitter.configs'.setup {
+  highlight = {
+    enable = true
+  },
+  indent = {
+    enable = true
+  }
+}
+EOF
+
 " fugitive
 nnoremap <silent> <leader>gs :G<cr><C-w>20+
 nnoremap <silent> <leader>gd :Gvdiff<cr><C-w>20+

nvim/statusline.vim

@@ -1,11 +1,3 @@
-function! StatuslineGitInfo()
-  let git = fugitive#head()
-  if git != ''
-    return git
-  else
-    return ""
-endfunction
-
 function! StatusLinePaste()
   if &paste
     return "PASTE"