From dd6604972f82258f950d79cd21af35d99d67d62b Mon Sep 17 00:00:00 2001
From: Andrew Lee <candrewlee14@gmail.com>
Date: Tue, 25 Jan 2022 22:45:42 -0700
Subject: [PATCH] remove treesitter from general

---
 Dockerfile                                  |  2 ++
 dot_config/nvim/init.vim                    |  4 ++-
 dot_config/nvim/templates/general.vim       | 33 +++++++++++----------
 dot_config/nvim/templates/general_plugs.vim |  2 +-
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3962df1..0d57393 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,5 +2,7 @@ FROM alpine:latest
 RUN apk update && apk add git curl
 RUN sh -c "$(curl -fsLS git.io/chezmoi)" -- init --apply candrewlee14
 RUN nvim --headless +'PlugInstall --sync' +qa
+RUN nvim --headless -u ~/.config/nvim/coq_init.vim +'PlugInstall --sync' +qa
+RUN nvim --headless -u ~/.config/nvim/cmp_init.vim +'PlugInstall --sync' +qa
 ENTRYPOINT ["/bin/zsh"]
 
diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim
index 70e9780..ff846c6 100644
--- a/dot_config/nvim/init.vim
+++ b/dot_config/nvim/init.vim
@@ -1,7 +1,9 @@
 call plug#begin()
-    source $HOME/.config/nvim/templates/general.vim
+    source $HOME/.config/nvim/templates/general_plugs.vim
 call plug#end()
 
+source $HOME/.config/nvim/templates/general.vim
+
 "Theme
 colorscheme gruvbox
 
diff --git a/dot_config/nvim/templates/general.vim b/dot_config/nvim/templates/general.vim
index b4287ca..47ffe8d 100644
--- a/dot_config/nvim/templates/general.vim
+++ b/dot_config/nvim/templates/general.vim
@@ -125,23 +125,24 @@ endif
 " Set termdebug
 let g:termdebug_wide=1
 
-lua << EOF
-require'nvim-treesitter.configs'.setup {
-  ensure_installed = { "zig", "python", "c", "bash", "json" }, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
-  sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
-  ignore_install = { "javascript" }, -- List of parsers to ignore installing
-  highlight = {
-    enable = true,              -- false will disable the whole extension
-    -- disable = { "c", "rust" },  -- list of language that will be disabled
-    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
-    additional_vim_regex_highlighting = false,
-  },
-}
+" Experimental Treesitter Plugin
+" lua << EOF
+" require'nvim-treesitter.configs'.setup {
+"   ensure_installed = { "zig", "python", "c", "bash", "json" }, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
+"   sync_install = false, -- install languages synchronously (only applied to `ensure_installed`)
+"   ignore_install = { "javascript" }, -- List of parsers to ignore installing
+"   highlight = {
+"     enable = true,              -- false will disable the whole extension
+"     -- disable = { "c", "rust" },  -- list of language that will be disabled
+"     -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
+"     -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
+"     -- Using this option may slow down your editor, and you may see some duplicate highlights.
+"     -- Instead of true it can also be a list of languages
+"     additional_vim_regex_highlighting = false,
+"   },
+" }
 
-EOF
+" EOF
 
 " Specific Local config
 if filereadable($HOME . "/.config/nvim/templates/general.vim.local")
diff --git a/dot_config/nvim/templates/general_plugs.vim b/dot_config/nvim/templates/general_plugs.vim
index 03a5dba..8398ba5 100644
--- a/dot_config/nvim/templates/general_plugs.vim
+++ b/dot_config/nvim/templates/general_plugs.vim
@@ -27,4 +27,4 @@ Plug 'preservim/nerdtree'
 Plug 'liuchengxu/vista.vim'
 " Syntax Highlighting
 Plug 'sheerun/vim-polyglot'
-Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}  " We recommend updating the parsers on update
+" Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} " Experimental