From c5ef9f6afb688ef14aee02f0c34d1ed0a7d51969 Mon Sep 17 00:00:00 2001
From: Daniel Lynn <daniel.eric.lynn@gmail.com>
Date: Wed, 15 Sep 2021 15:35:52 -0500
Subject: [PATCH] Update indent guides

---
 nvim/coc-settings.json |  3 ++-
 nvim/coc.vimrc         |  2 +-
 nvim/lua/indent.lua    |  2 ++
 vimrc                  | 16 +++-------------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/nvim/coc-settings.json b/nvim/coc-settings.json
index e99ae2d..88c92f7 100644
--- a/nvim/coc-settings.json
+++ b/nvim/coc-settings.json
@@ -49,5 +49,6 @@
   "snippets.textmateSnippetsRoots": [
     "~/.config/coc/snippets"
   ],
-  "rust-analyzer.checkOnSave.command": "clippy"
+  "rust-analyzer.checkOnSave.command": "clippy",
+  "solargraph.folding": true
 }
diff --git a/nvim/coc.vimrc b/nvim/coc.vimrc
index fc434ac..a6cd67a 100644
--- a/nvim/coc.vimrc
+++ b/nvim/coc.vimrc
@@ -111,7 +111,7 @@ xmap <silent> <C-s> <Plug>(coc-range-select)
 command! -nargs=0 Format :call CocAction('format')
 
 " Add `:Fold` command to fold current buffer.
-command! -nargs=? Fold :call     CocAction('fold', <f-args>)
+"command! -nargs=? Fold :call     CocAction('fold', <f-args>)
 
 " Add `:OR` command for organize imports of the current buffer.
 command! -nargs=0 OR   :call     CocAction('runCommand', 'editor.action.organizeImport')
diff --git a/nvim/lua/indent.lua b/nvim/lua/indent.lua
index 361b3de..c5fc538 100644
--- a/nvim/lua/indent.lua
+++ b/nvim/lua/indent.lua
@@ -8,5 +8,7 @@ require("indent_blankline").setup {
     "IndentBlanklineContext5",
     "IndentBlanklineContext6",
   },
+  show_end_of_line = true,
   show_current_context = true,
+  use_treesitter = true,
 }
diff --git a/vimrc b/vimrc
index 8f99cde..1d2ad5a 100644
--- a/vimrc
+++ b/vimrc
@@ -12,8 +12,8 @@ set encoding=utf-8
 set expandtab
 set exrc
 set fillchars=vert:▐
-set foldlevelstart=1
-set foldmethod=manual
+set foldmethod=expr
+set foldexpr=nvim_treesitter#foldexpr()
 set hidden
 set history=50
 set incsearch
@@ -98,7 +98,7 @@ if filereadable(expand("~/.config/nvim/git.vimrc"))
   source ~/.config/nvim/git.vimrc
 endif
 
-" NERDTree setup
+" Tree setup
 if filereadable(expand("~/.config/nvim/nvimtree.vimrc"))
   source ~/.config/nvim/nvimtree.vimrc
 endif
@@ -123,16 +123,6 @@ if filereadable(expand("~/.config/nvim/markdown.vimrc"))
   source ~/.config/nvim/markdown.vimrc
 endif
 
-" Ruby setup
-if filereadable(expand("~/.config/nvim/ruby.vimrc"))
-  source ~/.config/nvim/ruby.vimrc
-endif
-
-" Rust setup
-if filereadable(expand("~/.config/nvim/rust.vimrc"))
-  source ~/.config/nvim/rust.vimrc
-endif
-
 " Color setup
 if filereadable(expand("~/.config/nvim/colors.vimrc"))
   source ~/.config/nvim/colors.vimrc