module(helix): Add typos-lsp to all languages' ls, and pass default lang settings via passthru in package

home/modules/programs/helix/default.nix

@@ -3,10 +3,31 @@
   pkgs,
   config,
   ...
-}: {
+}: let
+  cfg = config.youthlic.programs.helix;
+  defaultLanguagesSettings = config.programs.helix.package.passthru.languages.language;
+in {
   options = {
     youthlic.programs.helix = {
       enable = lib.mkEnableOption "helix";
+      languageSettings = lib.mkOption {
+        type = lib.types.attrsOf (lib.types.submodule ({...}: {
+          freeformType = lib.types.anything;
+          options = {
+            language-servers = lib.mkOption {
+              type = lib.types.listOf (lib.types.either lib.types.str lib.types.anything);
+              default = ["typos-lsp"];
+              example = ["rust-analyzer"];
+              apply = lib.unique;
+            };
+          };
+        }));
+        default = lib.pipe defaultLanguagesSettings [
+          (map (lang: lib.nameValuePair lang.name (lib.removeAttrs lang ["name"])))
+          lib.listToAttrs
+        ];
+        apply = lib.mapAttrsToList (name: value: {inherit name;} // value);
+      };
       extraPackages = lib.mkOption {
         type = lib.types.listOf lib.types.package;
         default = [];
@@ -21,45 +42,61 @@
       };
     };
   };
-  config = let
+  config = lib.mkMerge [
-    cfg = config.youthlic.programs.helix;
+    (lib.mkIf cfg.enable {
-  in {
+      programs.helix = {
-    programs.helix = lib.mkIf cfg.enable {
+        enable = true;
-      enable = true;
+        defaultEditor = true;
-      defaultEditor = true;
+        extraPackages = cfg.extraPackages;
-      extraPackages = cfg.extraPackages;
+        settings = ./config.toml |> builtins.readFile |> builtins.fromTOML;
-      settings = ./config.toml |> builtins.readFile |> builtins.fromTOML;
+        languages =
-      languages = {
+          lib.recursiveUpdate
-        language-server = {
-          neocmakelsp = {
-            command = "neocmakelsp";
-            args = [
-              "stdio"
-            ];
-          };
-          fish-lsp = {
-            command = "fish-lsp";
-            args = [
-              "start"
-            ];
-          };
-          ty = {
-            command = "ty";
-            args = [
-              "server"
-            ];
-          };
-        };
-        language = [
           {
-            name = "cmake";
+            language-server = {
+              neocmakelsp = {
+                command = "neocmakelsp";
+                args = [
+                  "stdio"
+                ];
+              };
+              fish-lsp = {
+                command = "fish-lsp";
+                args = [
+                  "start"
+                ];
+              };
+              ty = {
+                command = "ty";
+                args = [
+                  "server"
+                ];
+              };
+              typos-lsp = {
+                command = "typos-lsp";
+              };
+            };
+          }
+          {language = cfg.languageSettings;};
+      };
+    })
+    (lib.mkIf cfg.enable {
+      youthlic.programs.helix.languageSettings = lib.pipe defaultLanguagesSettings [
+        (map ({name, ...}: lib.nameValuePair name {language-servers = ["typos-lsp"];}))
+        lib.listToAttrs
+      ];
+    })
+    (lib.mkIf cfg.enable {
+      youthlic.programs.helix.languageSettings =
+        lib.recursiveUpdate
+        (lib.pipe defaultLanguagesSettings [(map (lang: lib.nameValuePair lang.name (lib.removeAttrs lang ["name"]))) lib.listToAttrs])
+        {
+          cmake = {
             language-servers = [
               "neocmakelsp"
               "cmake-language-server"
             ];
-          }
+          };
-          {
+          kdl = {
-            name = "kdl";
             formatter = {
               command = "kdlfmt";
               args = [
@@ -67,24 +104,21 @@
                 "-"
               ];
             };
-          }
+          };
-          {
+          just = {
-            name = "just";
             formatter = {
               command = "just";
               args = [
                 "--dump"
               ];
             };
-          }
+          };
-          {
+          nix = {
-            name = "nix";
             formatter = {
               command = "alejandra";
             };
-          }
+          };
-          {
+          xml = {
-            name = "xml";
             formatter = {
               command = "xmllint";
               args = [
@@ -92,27 +126,23 @@
                 "-"
               ];
             };
-          }
+          };
-          {
+          typst = {
-            name = "typst";
             formatter = {
               command = "typstyle";
             };
-          }
+          };
-          {
+          c = {
-            name = "c";
             formatter = {
               command = "clang-format";
             };
-          }
+          };
-          {
+          cpp = {
-            name = "cpp";
             formatter = {
               command = "clang-format";
             };
-          }
+          };
-          {
+          python = {
-            name = "python";
             formatter = {
               command = "ruff";
               args = [
@@ -128,15 +158,13 @@
               "ruff"
               "ty"
             ];
-          }
+          };
-          {
+          go = {
-            name = "go";
             formatter = {
               command = "goimports";
             };
-          }
+          };
-          {
+          awk = {
-            name = "awk";
             formatter = {
               command = "awk";
               timeout = 5;
@@ -145,15 +173,13 @@
                 "--pretty-print=/dev/stdout"
               ];
             };
-          }
+          };
-          {
+          fish = {
-            name = "fish";
             language-servers = [
               "fish-lsp"
             ];
-          }
+          };
-          {
+          yaml = {
-            name = "yaml";
             formatter = {
               command = "deno";
               args = [
@@ -163,9 +189,8 @@
                 "yaml"
               ];
             };
-          }
+          };
-          {
+          html = {
-            name = "html";
             formatter = {
               command = "deno";
               args = [
@@ -178,9 +203,8 @@
             language-servers = [
               "vscode-html-language-server"
             ];
-          }
+          };
-          {
+          css = {
-            name = "css";
             formatter = {
               command = "deno";
               args = [
@@ -193,9 +217,8 @@
             language-servers = [
               "vscode-css-language-server"
             ];
-          }
+          };
-          {
+          toml = {
-            name = "toml";
             formatter = {
               command = "taplo";
               args = [
@@ -203,9 +226,8 @@
                 "-"
               ];
             };
-          }
+          };
-          {
+          markdown = {
-            name = "markdown";
             formatter = {
               command = "deno";
               args = [
@@ -215,9 +237,8 @@
                 "md"
               ];
             };
-          }
+          };
-          {
+          json = {
-            name = "json";
             language-servers = [
               "vscode-json-language-server"
             ];
@@ -230,9 +251,8 @@
                 "json"
               ];
             };
-          }
+          };
-          {
+          jsonc = {
-            name = "jsonc";
             language-servers = [
               "vscode-json-language-server"
             ];
@@ -245,9 +265,8 @@
                 "jsonc"
               ];
             };
-          }
+          };
-        ];
+        };
-      };
+    })
-    };
+  ];
-  };
 }

pkgs/helix/package.nix

@@ -4,14 +4,27 @@
   callPackage,
   symlinkJoin,
   makeWrapper,
+  lib,
 }: let
   inherit (inputs.helix.packages."${system}") helix;
+  helixWithPassthru =
+    helix
+    // {
+      passthru =
+        helix.passthru
+        // {
+          languages = lib.pipe "${helix.src}/languages.toml" [
+            builtins.readFile
+            builtins.fromTOML
+          ];
+        };
+    };
   runtime = callPackage ./runtime.nix {};
 in
   symlinkJoin {
     name = "helix-wrapped";
-    paths = [helix];
+    paths = [helixWithPassthru];
-    inherit (helix) meta;
+    inherit (helixWithPassthru) meta;
     buildInputs = [
       makeWrapper
     ];
@@ -19,4 +32,9 @@ in
       wrapProgram $out/bin/hx \
       --set HELIX_RUNTIME ${runtime}
     '';
+    passthru =
+      helixWithPassthru.passthru
+      // {
+        helix-unwrapped = helixWithPassthru;
+      };
   }