refactor(nvim): integrations with rescript lsp and treesitter

r17x · May 26, 2024 · 233ed35 · 233ed35
1 parent 3badc1a
commit 233ed35
Show file tree

Hide file tree

Showing 5 changed files with 301 additions and 24 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -66,7 +66,6 @@
     # e.g: rescript-nvim to be vimPlugins_rescript-nvim
     # e.g usage: programs.neovim.plugins = p: [p.rescript-nvim] or [pkgs.vimPlugins.rescript-nvim];
     vimPlugins_vim-rescript = { url = "github:rescript-lang/vim-rescript"; flake = false; };
-    vimPlugins_nvim-treesitter-rescript = { url = "github:nkrkv/nvim-treesitter-rescript"; flake = false; };
 
     # others 
     ts-rescript = { url = "github:nkrkv/tree-sitter-rescript"; flake = false; };

diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix
@@ -3,11 +3,13 @@
 {
   flake.overlays.default = final: prev: {
 
-    tree-sitter-grammars.tree-sitter-rescript = prev.tree-sitter.buildGrammar {
-      version = inputs.ts-rescript.lastModifiedDate;
-      language = "rescript";
-      generate = true;
-      src = inputs.ts-rescript;
+    tree-sitter-grammars = prev.tree-sitter-grammars // {
+      tree-sitter-rescript = prev.tree-sitter.buildGrammar {
+        version = inputs.ts-rescript.lastModifiedDate;
+        language = "rescript";
+        generate = true;
+        src = inputs.ts-rescript;
+      };
     };
 
     vimPlugins = prev.vimPlugins.extend (_: _: { } //

diff --git a/nvim.nix/config/lsp.nix b/nvim.nix/config/lsp.nix
@@ -26,7 +26,9 @@
   extraConfigLuaPost = ''
     require('telescope').load_extension('gh')
 
-    require'lspconfig'.ocamllsp.setup({
+    local lspconfig = require('lspconfig')
+    lspconfig.rescriptls.setup{}
+    lspconfig.ocamllsp.setup({
       settings = {
         codelens = {enable = false },
         extendedHover = { enable = true },

diff --git a/nvim.nix/config/ui.nix b/nvim.nix/config/ui.nix
@@ -142,6 +142,297 @@
   plugins.treesitter.folding = true;
   plugins.treesitter.indent = true;
   plugins.treesitter.nixvimInjections = true;
+  # plugins.treesitter.grammarPackages = pkgs.vimPlugins.nvim-treesitter.passthru.allGrammars ++ [ pkgs.tree-sitter-rescript ];
+  plugins.treesitter.ignoreInstall = [
+    # ┌─────────────────────────────────────┐
+    # │ move to ensureInstalled for enabled │
+    # └─────────────────────────────────────┘
+    "ada"
+    "agda"
+    "angular"
+    "apex"
+    "arduino"
+    "astro"
+    "authzed"
+    "awk"
+    "bass"
+    "beancount"
+    "bibtex"
+    "bicep"
+    "bitbake"
+    "blueprint"
+    "c_sharp"
+    "cairo"
+    "capnp"
+    "chatito"
+    "clojure"
+    "commonlisp"
+    "cooklang"
+    "corn"
+    "cpon"
+    "cpp"
+    "csv"
+    "cuda"
+    "cue"
+    "d"
+    "dart"
+    "devicetree"
+    "disassembly"
+    "djot"
+    "doxygen"
+    "dtd"
+    "earthfile"
+    "ebnf"
+    "eds"
+    "eex"
+    "elixir"
+    "elm"
+    "elsa"
+    "elvish"
+    "embedded_template"
+    "erlang"
+    "facility"
+    "faust"
+    "fennel"
+    "fidl"
+    "firrtl"
+    "foam"
+    "forth"
+    "fortran"
+    "fsh"
+    "func"
+    "fusion"
+    "gdscript"
+    "gdshader"
+    "gleam"
+    "glimmer"
+    "glsl"
+    "gn"
+    "gnuplot"
+    "godot_resource"
+    "gowork"
+    "groovy"
+    "gstlaunch"
+    "hack"
+    "hare"
+    "heex"
+    "hjson"
+    "hlsl"
+    "hlsplaylist"
+    "hocon"
+    "hoon"
+    "htmldjango"
+    "hurl"
+    "hyprlang"
+    "idl"
+    "ini"
+    "inko"
+    "ispc"
+    "janet_simple"
+    "java"
+    "json5"
+    "jsonc"
+    "jsonnet"
+    "julia"
+    "just"
+    "kconfig"
+    "kdl"
+    "kotlin"
+    "koto"
+    "kusto"
+    "lalrpop"
+    "ledger"
+    "leo"
+    "linkerscript"
+    "liquid"
+    "liquidsoap"
+    "llvm"
+    "m68k"
+    "matlab"
+    "menhir"
+    "meson"
+    "mlir"
+    "muttrc"
+    "nasm"
+    "nickel"
+    "nim"
+    "nim_format_string"
+    "ninja"
+    "nqc"
+    "objc"
+    "objdump"
+    "odin"
+    "org"
+    "pascal"
+    "pem"
+    "perl"
+    "php"
+    "php_only"
+    "phpdoc"
+    "pioasm"
+    "pod"
+    "poe_filter"
+    "pony"
+    "printf"
+    "prisma"
+    "promql"
+    "properties"
+    "prql"
+    "psv"
+    "pug"
+    "puppet"
+    "purescript"
+    "ql"
+    "qmldir"
+    "qmljs"
+    "r"
+    "racket"
+    "rasi"
+    "rbs"
+    "re2c"
+    "readline"
+    "rego"
+    "requirements"
+    "rnoweb"
+    "robot"
+    "roc"
+    "ron"
+    "rst"
+    "ruby"
+    "scala"
+    "scfg"
+    "scheme"
+    "scss"
+    "slang"
+    "slint"
+    "smali"
+    "smithy"
+    "snakemake"
+    "solidity"
+    "soql"
+    "sosl"
+    "sourcepawn"
+    "sparql"
+    "squirrel"
+    "starlark"
+    "strace"
+    "styled"
+    "supercollider"
+    "surface"
+    "svelte"
+    "swift"
+    "sxhkdrc"
+    "systemtap"
+    "t32"
+    "tablegen"
+    "tact"
+    "tcl"
+    "teal"
+    "thrift"
+    "tiger"
+    "tlaplus"
+    "tsv"
+    "turtle"
+    "twig"
+    "typespec"
+    "typoscript"
+    "typst"
+    "udev"
+    "ungrammar"
+    "unison"
+    "usd"
+    "uxntal"
+    "v"
+    "vala"
+    "vento"
+    "verilog"
+    "vue"
+    "wgsl"
+    "wgsl_bevy"
+    "wing"
+    "wit"
+    "xcompose"
+    "yang"
+    "yuck"
+    "zathurarc"
+    "zig"
+  ];
+  plugins.treesitter.ensureInstalled = [
+    # ┌────────────────────────────────────┐
+    # │ move to ignoreInstall for disabled │
+    # └────────────────────────────────────┘
+    "asm"
+    "bash"
+    "c"
+    "cmake"
+    "comment"
+    "css"
+    "dhall"
+    "diff"
+    "dockerfile"
+    "dot"
+    "fish"
+    "git_config"
+    "git_rebase"
+    "gitattributes"
+    "gitcommit"
+    "gitignore"
+    "go"
+    "gomod"
+    "gosum"
+    "gotmpl"
+    "gpg"
+    "graphql"
+    "haskell"
+    "haskell_persistent"
+    "hcl"
+    "helm"
+    "html"
+    "http"
+    "javascript"
+    "jq"
+    "jsdoc"
+    "json"
+    "latex"
+    "lua"
+    "luadoc"
+    "luap"
+    "luau"
+    "make"
+    "markdown"
+    "markdown_inline"
+    "mermaid"
+    "nix"
+    "norg"
+    "norg_meta"
+    "ocaml"
+    "ocaml_interface"
+    "ocamllex"
+    "passwd"
+    "po"
+    "proto"
+    "pymanifest"
+    "python"
+    "query"
+    "regex"
+    "rust"
+    "rescript"
+    "sql"
+    "ssh_config"
+    "templ"
+    "terraform"
+    "textproto"
+    "tmux"
+    "todotxt"
+    "toml"
+    "tsx"
+    "typescript"
+    "vhs"
+    "vim"
+    "vimdoc"
+    "xml"
+    "yaml"
+  ];
 
   plugins.rainbow-delimiters.enable = true;
   plugins.rainbow-delimiters.highlight = [