From 76bf280f9d836fb5c46278fb74be2f4f8b767293 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Fri, 30 Apr 2021 13:30:39 +0200
Subject: [PATCH] more treesitter

---
 files/.config/nvim/fnl/init.fnl               |  2 --
 files/.config/nvim/fnl/plugins/bufferline.fnl |  6 ++---
 files/.config/nvim/fnl/plugins/lsp.fnl        | 25 +++++++++++--------
 files/.config/nvim/plugins.lua                |  5 ++++
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/files/.config/nvim/fnl/init.fnl b/files/.config/nvim/fnl/init.fnl
index efc6237..188e101 100644
--- a/files/.config/nvim/fnl/init.fnl
+++ b/files/.config/nvim/fnl/init.fnl
@@ -15,8 +15,6 @@
 
 
 
-
-
 ; " :: and _ as space ------------------------------------------------------------------- {{{
 (var remapped-space nil)
 (fn _G.RebindShit [newKey]
diff --git a/files/.config/nvim/fnl/plugins/bufferline.fnl b/files/.config/nvim/fnl/plugins/bufferline.fnl
index ec9a0d6..54e2f97 100644
--- a/files/.config/nvim/fnl/plugins/bufferline.fnl
+++ b/files/.config/nvim/fnl/plugins/bufferline.fnl
@@ -44,9 +44,9 @@
         :diagnostic_visible  { :gui "" :guibg colors.dark1        :guifg colors.neutral_red}
         :diagnostic_selected { :gui "" :guibg colors.neutral_aqua :guifg colors.faded_red}
 
-        :info_diagnostic          { :gui "" :guibg "blue" :guifg colors.neutral_yellow}
-        :info_diagnostic_visible  { :gui "" :guibg "blue" :guifg colors.neutral_yellow}
-        :info_diagnostic_selected { :gui "" :guibg "blue" :guifg colors.faded_yellow}
+        :info_diagnostic          { :gui "" :guibg colors.dark1        :guifg colors.neutral_blue}
+        :info_diagnostic_visible  { :gui "" :guibg colors.dark1        :guifg colors.neutral_blue}
+        :info_diagnostic_selected { :gui "" :guibg colors.neutral_aqua :guifg colors.faded_blue}
 
         :warning_diagnostic          { :gui "" :guibg colors.dark1        :guifg colors.neutral_yellow}
         :warning_diagnostic_visible  { :gui "" :guibg colors.dark1        :guifg colors.neutral_yellow}
diff --git a/files/.config/nvim/fnl/plugins/lsp.fnl b/files/.config/nvim/fnl/plugins/lsp.fnl
index e1980e6..6a530fc 100644
--- a/files/.config/nvim/fnl/plugins/lsp.fnl
+++ b/files/.config/nvim/fnl/plugins/lsp.fnl
@@ -17,20 +17,24 @@
 (local colors (utils.colors))
 
 (symbols-outline.setup { :highlight_hovered_item true :show_guides true})
-(set vim.o.signcolumn "yes")
 
 (nvim-treesitter-configs.setup 
-  { :ensure_installed "maintained" 
+  { :ensure_installed "all" 
     :highlight { :enable true}
-    :indent { :enable true}
-    :incremental_selection 
-    { :enable true
-      :keymaps { :init_selection    "gss"
-                 :node_incremental  "gsl"
-                 :node_decremental  "gsh"
-                 :scope_incremental "gsj"
-                 :scope_decremental "gsk"}}})
+    :indent    { :enable true}
 
+    :incremental_selection 
+      { :enable true
+        :keymaps { :init_selection    "gss"
+                   :node_incremental  "gsl"
+                   :node_decremental  "gsh"
+                   :scope_incremental "gsj"
+                   :scope_decremental "gsk"}}
+
+    :rainbow { :enable true
+               :extended_mode true}
+
+    :context_commentstring { :enable true}})
 
 ; LSP config -------------------------------------------------------------------------------- {{{{{
 
@@ -151,5 +155,6 @@
 ; }}}}}
 
 
+(set vim.o.signcolumn "yes")
 
  ; vim:foldmarker={{{{{,}}}}}
diff --git a/files/.config/nvim/plugins.lua b/files/.config/nvim/plugins.lua
index cdfb8f6..53a78f5 100644
--- a/files/.config/nvim/plugins.lua
+++ b/files/.config/nvim/plugins.lua
@@ -15,6 +15,11 @@ require("packer").startup(function(use)
 
   use_rocks "rtsisyk/fun"
 
+  use "p00f/nvim-ts-rainbow"
+  use "romgrk/nvim-treesitter-context"
+
+  use 'JoosepAlviste/nvim-ts-context-commentstring'
+
   use {
     "nvim-treesitter/nvim-treesitter",
     run = ":TSUpdate"