nvim: Switch to nvim-ts-rainbow2

home/config/nvim/after/queries/fennel/rainbow-parens.scm

@@ -0,0 +1,11 @@
+(list
+ ("(" @opening)
+ (")" @closing)) @container
+
+(table
+ ("{" @opening)
+ ("}" @closing)) @container
+
+(sequential_table
+ ("[" @opening)
+ ("]" @closing)) @container

home/config/nvim/nifoc/theme.fnl

@@ -25,7 +25,15 @@
     ;; vim-illuminate
     (highlight :IlluminatedWordText {:bg mod.colors.selection})
     (highlight :IlluminatedWordRead {:bg mod.colors.selection})
-    (highlight :IlluminatedWordWrite {:bg mod.colors.selection :underline true}))
+    (highlight :IlluminatedWordWrite {:bg mod.colors.selection :underline true})
+    ;; nvim-ts-rainbow2
+    (highlight :TSRainbowRed {:fg mod.colors.red})
+    (highlight :TSRainbowYellow {:fg mod.colors.yellow})
+    (highlight :TSRainbowBlue {:fg mod.colors.purple})
+    (highlight :TSRainbowOrange {:fg mod.colors.orange})
+    (highlight :TSRainbowGreen {:fg mod.colors.green})
+    (highlight :TSRainbowViolet {:fg mod.colors.pink})
+    (highlight :TSRainbowCyan {:fg mod.colors.cyan}))
 
   mod)
 

home/config/nvim/plugins/treesitter.fnl

@@ -33,7 +33,7 @@
                        :typescript
                        :vim
                        :yaml]
-      rainbow-parsers [:fennel]
+      rainbow-parsers [:css :fennel :json :query :yaml]
       disable-parsers []]
   (nifoc-treesitter.setup)
   (treesitter-config.setup {:ensure_installed []
@@ -51,7 +51,9 @@
                                       :disable (vim.tbl_filter (fn [parser]
                                                                  (not (vim.tbl_contains rainbow-parsers
                                                                                         parser)))
-                                                               install-parsers)}
+                                                               install-parsers)
+                                      :query :rainbow-parens
+                                      :strategy (require :ts-rainbow.strategy.global)}
                             :matchup {:enable true :disable disable-parsers}
                             :autopairs {:enable true :disable disable-parsers}
                             :autotag {:enable true :disable disable-parsers}

home/programs/nvim/default.nix

@@ -146,7 +146,7 @@ in
         type = "fennel";
       }
 
-      nvim-ts-rainbow
+      nvim-ts-rainbow2
       playground
 
       # Telescope

home/programs/nvim/plugins.nix

@@ -121,14 +121,14 @@ rec {
       fetchSubmodules = false;
     };
   });
-  nvim-ts-rainbow = pkgs.vimUtils.buildVimPluginFrom2Nix {
+  nvim-ts-rainbow2 = pkgs.vimUtils.buildVimPluginFrom2Nix {
-    pname = "nvim-ts-rainbow";
+    pname = "nvim-ts-rainbow2";
-    version = "2023-02-21";
+    version = "2023-03-03";
     src = pkgs.fetchFromGitHub {
-      owner = "mrjones2014";
+      owner = "HiPhish";
-      repo = "nvim-ts-rainbow";
+      repo = "nvim-ts-rainbow2";
-      rev = "81f9a2e752edc793a34355be952dd1ebb1d5701b";
+      rev = "293e12e90f0928845582b9a3db7258eaa8e92a65";
-      sha256 = "1zc8p31dmlwsqrz8p9r6xnhq9zwgvq82crgr339w0ndn3m0wy508";
+      sha256 = "069nyc2bxi5wyvbnyqmdif2vqk7fv0kfgz3b7r7xgjf6s4kgw9yl";
       fetchSubmodules = false;
     };
   };

home/programs/nvim/plugins.yaml

@@ -19,7 +19,7 @@
 
 # Syntax
 - src: nvim-treesitter/nvim-treesitter
-- src: mrjones2014/nvim-ts-rainbow
+- src: HiPhish/nvim-ts-rainbow2
 - src: nvim-treesitter/playground
 
 # Telescope