we on .5 now

5 files changed, 29 insertions, 7 deletions

diff --git a/init.vim b/init.vim
index 08c12c81..7ac7c248 100644
--- a/init.vim
+++ b/init.vim
@@ -37,6 +37,7 @@ else
   source $HOME/.config/nvim/plug-config/sneak.vim
   source $HOME/.config/nvim/plug-config/codi.vim
   source $HOME/.config/nvim/plug-config/vim-wiki.vim
+  luafile $HOME/.config/nvim/lua/treesitter.lua
   source $HOME/.config/nvim/plug-config/coc.vim
   source $HOME/.config/nvim/plug-config/goyo.vim
   source $HOME/.config/nvim/plug-config/vim-rooter.vim
diff --git a/keys/which-key.vim b/keys/which-key.vim
index 200a0984..538c57cf 100644
--- a/keys/which-key.vim
+++ b/keys/which-key.vim
@@ -1,5 +1,7 @@
 " Leader Key Maps
 
+let @s = 'veS"'
+
 " Map leader to which_key
 nnoremap <silent> <leader> :silent <c-u> :silent WhichKey '<Space>'<CR>
 vnoremap <silent> <leader> :silent <c-u> :silent WhichKeyVisual '<Space>'<CR>
@@ -18,10 +20,6 @@ let g:which_key_map['?'] = 'search word'
 let g:which_key_use_floating_win = 0
 
 " Change the colors if you want
-highlight default link WhichKey          Operator
-highlight default link WhichKeySeperator DiffAdded
-highlight default link WhichKeyGroup     Identifier
-highlight default link WhichKeyDesc      Function
 
 " Hide status line
 autocmd! FileType which_key
@@ -54,13 +52,14 @@ let g:which_key_map.a = {
       \ 'name' : '+actions' ,
       \ 'c' : [':ColorizerToggle'        , 'colorizer'],
       \ 'e' : [':CocCommand explorer'    , 'explorer'],
+      \ 'h' : [':let @/ = ""'            , 'remove search highlight'],
       \ 'l' : [':Bracey'                 , 'start live server'],
       \ 'L' : [':BraceyStop'             , 'stop live server'],
       \ 'm' : [':MarkdownPreview'        , 'markdown preview'],
       \ 'M' : [':MarkdownPreviewStop'    , 'markdown preview stop'],
       \ 'n' : [':set nonumber!'          , 'line-numbers'],
+      \ 's' : [':s/\%V\(.*\)\%V/"\1"/'          , 'surround'],
       \ 'r' : [':set norelativenumber!'  , 'relative line nums'],
-      \ 's' : [':let @/ = ""'            , 'remove search highlight'],
       \ 't' : [':FloatermToggle'         , 'terminal'],
       \ 'v' : [':Codi'                   , 'virtual repl on'],
       \ 'V' : [':Codi!'                  , 'virtual repl off'],
diff --git a/lua/treesitter.lua b/lua/treesitter.lua
new file mode 100644
index 00000000..106c3731
--- /dev/null
+++ b/lua/treesitter.lua
@@ -0,0 +1,16 @@
+require'nvim-treesitter.configs'.setup {
+  ensure_installed = "all", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
+  highlight = {
+    enable = true,              -- false will disable the whole extension
+    disable = { "c", "rust" },  -- list of language that will be disabled
+  },
+}
+
+require "nvim-treesitter.configs".setup {
+  playground = {
+    enable = true,
+    disable = {},
+    updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
+    persist_queries = false -- Whether the query persists across vim sessions
+  }
+}
diff --git a/plug-config/rnvimr.vim b/plug-config/rnvimr.vim
index 64eed471..8011e1d8 100644
--- a/plug-config/rnvimr.vim
+++ b/plug-config/rnvimr.vim
@@ -1,5 +1,5 @@
 " Make Ranger replace netrw and be the file explorer
-let g:rnvimr_ex_enable = 1
+" let g:rnvimr_ex_enable = 1
 
 let g:rnvimr_draw_border = 1
 
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index f648be3b..2b23e3a6 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -40,8 +40,14 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     " auto set indent settings
     Plug 'tpope/vim-sleuth'
     " Better Syntax Support
-    " Plug 'nvim-treesitter/nvim-treesitter'
     Plug 'sheerun/vim-polyglot'
+    " Treesitter
+    Plug 'nvim-treesitter/nvim-treesitter'
+    Plug 'nvim-treesitter/nvim-treesitter-refactor'
+    Plug 'nvim-treesitter/nvim-treesitter-textobjects'
+    Plug 'nvim-treesitter/playground'
+    Plug 'romgrk/nvim-treesitter-context'
+
     " Cool Icons
     Plug 'ryanoasis/vim-devicons'
     " Auto pairs for '(' '[' '{'