refactor

modules/capabilities/helix.nix

@@ -1,6 +1,9 @@
-{ inputs, ... }:
+{ config, inputs, ... }:
+let
+  homeModules = config.flake.modules.homeManager;
+in
 {
-  flake.modules.nixos.helix = {
+  flake.modules.nixos.helix-cache = {
     nix.settings = {
       extra-substituters = [ "https://helix.cachix.org" ];
       extra-trusted-public-keys = [
@@ -12,30 +15,11 @@
   flake.modules.homeManager.helix =
     { pkgs, ... }:
     let
-      svelteLanguageServer = pkgs.svelte-language-server.overrideAttrs (
-        finalAttrs: previousAttrs: {
-          version = "0.18.3";
-
-          src = pkgs.fetchFromGitHub {
-            owner = "sveltejs";
-            repo = "language-tools";
-            tag = "svelte-language-server@${finalAttrs.version}";
-            hash = "sha256-FTOkJPXbsG6R53yr4n0/IR2lzFCovrdV0+epOi07lBQ=";
-          };
-
-          pnpmDeps = pkgs.fetchPnpmDeps {
-            inherit (finalAttrs)
-              pname
-              version
-              src
-              pnpmWorkspaces
-              ;
-            pnpm = pkgs.pnpm_10;
-            fetcherVersion = 3;
-            hash = "sha256-fY3hrCkr/soJk1gp39/jec8lT2ZJI27xRBCZi006oWA=";
-          };
-
+      svelteLanguageServer = (import ./_svelte-language-server.nix { inherit pkgs; }).overrideAttrs (
+        _: previousAttrs: {
           postInstall = (previousAttrs.postInstall or "") + ''
+            # @vscode/emmet-helper only enables JSX expansion for JSX syntax;
+            # Helix's Svelte HTML regions also need it for HTML syntax.
             substituteInPlace \
               "$out/lib/node_modules/svelte-language-server/packages/language-server/node_modules/@vscode/emmet-helper/lib/cjs/emmetHelper.js" \
               --replace-fail \
@@ -48,7 +32,6 @@
     {
       programs.helix = {
         enable = true;
-        defaultEditor = true;
         package = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default;
         extraPackages = with pkgs; [
           vtsls
@@ -179,4 +162,9 @@
         };
       };
     };
+
+  flake.modules.homeManager.primary-editor-helix = {
+    imports = [ homeModules.helix ];
+    programs.helix.defaultEditor = true;
+  };
 }