feat(neovim): add tree-sitter-pest support and refactor configurations

neovim/default.nix

@@ -1,8 +1,4 @@
-{
-  pkgs,
-  # config,
-  ...
-}: let
+{pkgs, ...}: let
   mkMappings = mappings:
     []
     ++ (pkgs.lib.optionals (builtins.hasAttr "normal" mappings) (mkMode mappings.normal "n"))
@@ -17,16 +13,16 @@
       mode = mode;
     })
     mappings;
-  border = [
-    "╭"
-    "─"
-    "╮"
-    "│"
-    "╯"
-    "─"
-    "╰"
-    "│"
-  ];
+  # border = [
+  #   "╭"
+  #   "─"
+  #   "╮"
+  #   "│"
+  #   "╯"
+  #   "─"
+  #   "╰"
+  #   "│"
+  # ];
   rawLua = lua: {
     "__raw" = ''
       ${lua}
@@ -349,9 +345,11 @@ in {
           tree-sitter-norg-meta
           tree-sitter-just
           tree-sitter-nu
-          # pkgs.tree-sitter-grammars.tree-sitter-d2
+          tree-sitter-pest
+          tree-sitter-slint
         ])
         ++ pkgs.vimPlugins.nvim-treesitter.allGrammars;
+      nixGrammars = true;
     };
 
     telescope = {
@@ -770,6 +768,12 @@ in {
           },
        })
 
+       vim.filetype.add({
+          extension = {
+             pest = "pest",
+          },
+       })
+
        vim.filetype.add({
            filename = {
                ['nurfile'] = "nu",

neovim/overlays.nix

@@ -29,6 +29,16 @@
           version = "1";
           src = inputs.tree-sitter-nu;
         };
+        tree-sitter-pest = final.pkgs.tree-sitter.buildGrammar {
+          language = "pest";
+          version = "1";
+          src = inputs.tree-sitter-pest;
+        };
+        tree-sitter-slint = final.pkgs.tree-sitter.buildGrammar {
+          language = "slint";
+          version = "1";
+          src = inputs.tree-sitter-slint;
+        };
       };
   };
 in [
@@ -37,3 +47,36 @@ in [
   vimPlugins
   tree-sitter-grammars
 ]
+# tree-sitter-grammars = final: prev: {
+#   tree-sitter-grammars =
+#     prev.tree-sitter-grammars
+#     // {
+#       # tree-sitter-just = final.pkgs.tree-sitter.buildGrammar {
+#       #   language = "just";
+#       #   version = "1";
+#       #   src = inputs.tree-sitter-just;
+#       # };
+#       # tree-sitter-nu = final.pkgs.tree-sitter.buildGrammar {
+#       #   language = "nu";
+#       #   version = "1";
+#       #   src = inputs.tree-sitter-nu;
+#       # };
+#       tree-sitter-d2 = final.pkgs.tree-sitter.buildGrammar {
+#         language = "d2";
+#         version = "1";
+#         src = inputs.tree-sitter-d2;
+#       };
+#     };
+# };
+# vimPlugins = final: prev: {
+#   vimPlugins =
+#     prev.vimPlugins
+#     // {
+#       d2 = final.pkgs.vimUtils.buildVimPlugin {
+#         name = "d2";
+#         version = "1";
+#         src = inputs.d2;
+#       };
+#     };
+# };
+