mzte-nv: use ltex-ls-plus

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730729172,
+        "lastModified": 1731300529,
-        "narHash": "sha256-RE6Fgw2FbVzWzRf5FD6LSIqSHTXq/hEm+GIqy7zcoe8=",
+        "narHash": "sha256-PwzToM8oltfO3GlHpo3hIqmhPZwTbwkdnMIe4NpaN4g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eb36bf249929bfd7a94c5f9ee0f1972ded7b6931",
+        "rev": "3f42f0b61e6c45ca80d87cec5dd11e121d6b9c14",
         "type": "github"
       },
       "original": {

mzte-nv/conf/lua/pluginconf/p-lspconf.fnl

@@ -42,6 +42,41 @@
 (setup :haxe_language_server)
 (setup :html)
 (setup :jsonls {:on_attach disable-formatter})
+(setup :ltex {:cmd [:ltex-ls-plus]
+              :filetypes [:typst
+                          :bib
+                          :gitcommit
+                          :markdown
+                          :org
+                          :plaintex
+                          :rst
+                          :rnoweb
+                          :tex
+                          :pandoc
+                          :quarto
+                          :rmd
+                          :context
+                          :html
+                          :xhtml
+                          :mail
+                          :text]
+              :settings {:ltex {:enabled [:typst
+                                          :bibtex
+                                          :gitcommit
+                                          :markdown
+                                          :org
+                                          :tex
+                                          :restructuredtext
+                                          :rsweave
+                                          :latex
+                                          :quarto
+                                          :rmd
+                                          :context
+                                          :html
+                                          :xhtml
+                                          :mail
+                                          :plaintext]}}})
+
 (setup :lua_ls {:settings {:Lua {:runtime {:version :LuaJIT
                                            :path (do
                                                    (var p

mzte-nv/conf/lua/pluginconf/p-nullls.fnl

@@ -3,9 +3,7 @@
 (macro src [categ name]
   `(. nullls :builtins ,categ ,name))
 
-(nullls.setup {:sources [(src :code_actions :shellcheck)
+(nullls.setup {:sources [(src :diagnostics :fish)
-                         (src :diagnostics :fish)
-                         (src :diagnostics :shellcheck)
                          (src :diagnostics :tidy)
                          (src :formatting :clang_format)
                          (src :formatting :fish_indent)

nix/cgnix/nvim-plugins.nix

@@ -5,7 +5,7 @@ let
   plugins = {
     # LSP
     "20-lspconfig" = plugin "nvim-lspconfig";
-    "20-nullls" = plugin "null-ls.nvim";
+    "20-nonels" = plugin "none-ls.nvim";
     "20-jdtls" = plugin "nvim-jdtls";
     "20-lsp-saga" = plugin "lspsaga.nvim";
 

nix/cgnix/nvim-tools/default.nix

@@ -23,6 +23,37 @@ let
     })
     (flakePkg "git+https://git.mzte.de/LordMZTE/haxe-language-server.git")
     config.output.packages.jdtls-wrapped
+    (
+      let
+        commit = "2b60af";
+      in
+      pkgs.stdenvNoCC.mkDerivation rec {
+        pname = "ltex-ls-plus";
+        version = "18.3.0";
+        src = fetchurl {
+          url =
+            "https://git.mzte.de/api/packages/LordMZTE/generic/ltex-ls-plus/${version}-${commit}-alpha/ltex-ls-plus-${version}-${commit}-alpha.tar.gz";
+          sha256 = "sha256-xiEQXfJNaTW61p6/4hZWr2WhxzwJfZtb8I+hS+s6Ji0=";
+        };
+
+        preferLocalBuild = true;
+
+        nativeBuildInputs = [ makeBinaryWrapper ];
+
+        installPhase = ''
+          runHook preInstall
+
+          mkdir -p $out
+          cp -rfv bin/ lib/ $out
+          rm -fv $out/bin/.lsp-cli.json $out/bin/*.bat
+          for file in $out/bin/{ltex-ls-plus,ltex-cli-plus}; do
+            wrapProgram $file --set JAVA_HOME "${jre_headless}"
+          done
+
+          runHook postInstall
+        '';
+      }
+    )
     lua-language-server
     (flakePkg "github:oxalica/nil")
     ocamlPackages.ocaml-lsp
@@ -54,7 +85,6 @@ let
 
     # Misc
     html-tidy
-    shellcheck
     tree-sitter
   ];
 in