From 641baa4989767daaae7c4ad20c8321a261d64707 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Wed, 21 May 2025 00:21:11 +0200
Subject: [PATCH] helix: languages: cleanup

---
 packages/helix/languages.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/helix/languages.nix b/packages/helix/languages.nix
index 501f536..39fec6b 100644
--- a/packages/helix/languages.nix
+++ b/packages/helix/languages.nix
@@ -17,9 +17,10 @@
   typescript-language-server,
   vscode-langservers-extracted,
   simple-completion-language-server,
+  zls,
   ...
 }: let
-  inherit (lib.meta) getExe;
+  inherit (lib.meta) getExe getExe';
 
   toml = formats.toml {};
 
@@ -102,6 +103,10 @@
         auto-format = true;
         language-servers = ["clangd"];
       }
+      {
+        name = "zig";
+        auto-format = true;
+      }
       {
         name = "c";
         debugger = {
@@ -154,7 +159,7 @@
       };
 
       deno-lsp = {
-        command = lib.getExe deno;
+        command = getExe deno;
         args = ["lsp"];
         environment.NO_COLOR = "1";
         config.deno = {
@@ -201,7 +206,7 @@
       };
 
       typescript-language-server = {
-        command = lib.getExe typescript-language-server;
+        command = getExe typescript-language-server;
         args = ["--stdio"];
         config = {
           typescript-language-server.source = {
@@ -214,12 +219,12 @@
         };
       };
       ruff = {
-        command = lib.getExe ruff;
+        command = getExe ruff;
         args = ["server"];
       };
 
       qmlls = {
-        command = lib.getExe' kdePackages.qtdeclarative "qmlls";
+        command = getExe' kdePackages.qtdeclarative "qmlls";
         args = ["-E"];
       };
       basedpyright.command = "${basedpyright}/bin/basedpyright-langserver";
@@ -233,6 +238,16 @@
           scss.validate.enable = true;
         };
       };
+      zls = {
+        command = getExe zls;
+        config = {
+          enable_build_on_save = true;
+          build_on_save_args = ["check" "-fincremental" "--watch"];
+          enable_autofix = false;
+          warn_style = true;
+          highlight_global_var_declarations = true;
+        };
+      };
     };
   };
 in