about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2022-02-26 14:55:27 +0900
committersefidel <contact@sefidel.net>2022-02-26 14:55:27 +0900
commitaceb6065119d621a84d0eceb9017f7036e24acee (patch)
tree4f3345d8cf72fc9bb28adb2931c0d2993a1a8b24
parent27010418b30db788bed4854465d3c7d1c1d548a8 (diff)
downloadnvimrc-aceb6065119d621a84d0eceb9017f7036e24acee.tar.gz
nvimrc-aceb6065119d621a84d0eceb9017f7036e24acee.zip
feat(treesitter): cleanup
-rw-r--r--fnl/nvrc/pack.fnl6
-rw-r--r--fnl/nvrc/packs/treesitter.fnl28
2 files changed, 4 insertions, 30 deletions
diff --git a/fnl/nvrc/pack.fnl b/fnl/nvrc/pack.fnl
index e33c6c8..bc13892 100644
--- a/fnl/nvrc/pack.fnl
+++ b/fnl/nvrc/pack.fnl
@@ -8,13 +8,9 @@
 (pack! :nanotech/jellybeans.vim {:config "require('nvrc.colors').apply('jellybeans')"})
 (pack! :feline-nvim/feline.nvim {:req :feline})
 (pack! :lukas-reineke/indent-blankline.nvim {:req :blankline :defer :indent-blankline.nvim})
-(pack! :NvChad/nvim-colorizer.lua {:init :colorizer :cmd :ColorizerToggle})
 (pack! :nvim-treesitter/nvim-treesitter {:req :treesitter
                                           :run ":TSUpdate"
-                                          :requires [(pack :p00f/nvim-ts-rainbow {:after :nvim-treesitter})
-                                                     (pack :nvim-treesitter/nvim-treesitter-refactor {:after :nvim-treesitter})
-                                                     (pack :nvim-treesitter/nvim-treesitter-textobjects {:after :nvim-treesitter})
-                                                     (pack :JoosepAlviste/nvim-ts-context-commentstring {:after :nvim-treesitter})]})
+                                          :requires [(pack :p00f/nvim-ts-rainbow {:after :nvim-treesitter})]})
 (pack! :Pocco81/TrueZen.nvim {:cmd [:TZMinimalist :TZFocus :TZAtaraxis]})
 (pack! :stefandtw/quickfix-reflector.vim {:ft :qf :defer :quickfix-reflector.vim})
 
diff --git a/fnl/nvrc/packs/treesitter.fnl b/fnl/nvrc/packs/treesitter.fnl
index befcbc9..2d12e1a 100644
--- a/fnl/nvrc/packs/treesitter.fnl
+++ b/fnl/nvrc/packs/treesitter.fnl
@@ -3,9 +3,8 @@
 (local colors (require :nvrc.colors))
 
 (setup {:ensure_installed [:fennel :lua :nix]
-        :highlight {:enable true}
-        :context_commentstring {:enable true
-                                :config {:fennel "; %s"}}
+        :highlight {:enable true
+                    :use_languagetree true}
         :rainbow {:enable true
                   :extended_mode true
                   :max_file_lines 2000
@@ -15,25 +14,4 @@
                            (. colors :blue)
                            (. colors :violet)
                            (. colors :magenta)]}
-        :indent {:enable true}
-        :refactor {:highlight_definitions {:enable true}
-                   :highlight_current_scope {:enable false}
-                   :smart_rename {:enable true
-                                  :keymaps {:smart_rename :grr}}
-                   :navigation {:enable true
-                                :keymaps {:goto_definition :gnd
-                                          :list_definitions :gnD
-                                          :goto_next_usage :<M-2>
-                                          :goto_previous_usage :<M-1>}}}
-        :textobjects {:select {:enable true
-                               :lookahead true
-                               :keymaps {:if "@function.inner"
-                                         :af "@function.outer"
-                                         :ic "@class.inner"
-                                         :ac "@class.outer"
-                                         :ia "@parameter.inner"
-                                         :aa "@parameter.outer"}}
-                      :swap {:enable true
-                             :swap_next {:<localleader>> "@parameter.inner"}
-                             :swap_previous {:<localleader>< "@parameter.inner"}}}
-        :matchup {:enable true}})
+        :indent {:enable true}})