refactor

modules/capabilities/neovim/default.nix

@@ -1,15 +1,9 @@
 { config, ... }:
 let
   account = config.facts.account;
-  theme = config.facts.theme.kanagawa;
+  homeModules = config.flake.modules.homeManager;
 in
 {
-  flake.modules.homeManager.default-editor-neovim =
-    { pkgs, ... }:
-    {
-      xdg.mimeApps.defaultApplicationPackages = [ pkgs.neovim ];
-    };
-
   flake.modules.homeManager.neovim =
     {
       pkgs,
@@ -20,30 +14,7 @@ in
     }:
     let
       nvimTreesitter = pkgs.vimPlugins.nvim-treesitter;
-      svelteLanguageServer = pkgs.svelte-language-server.overrideAttrs (
-        finalAttrs: _: {
-          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; };
       svelteGrammar = nvimTreesitter.builtGrammars.svelte.overrideAttrs (_: {
         version = "0.0.0+rev=c2457b9";
         src = pkgs.fetchFromGitHub {
@@ -61,11 +32,6 @@ in
       );
     in
     {
-      home.sessionVariables = {
-        EDITOR = "nvim";
-        VISUAL = "nvim";
-      };
-
       imports = [
         (inputs.nix-wrapper-modules.lib.getInstallModule {
           name = "neovim";
@@ -195,7 +161,7 @@ in
           };
 
           themeSetup = import ./_kanagawa-theme.nix {
-            themeName = theme.name;
+            themeName = "kanagawa-wave";
           };
 
           typstPreviewDependencies = {
@@ -209,4 +175,16 @@ in
         binName = "nvim";
       };
     };
+
+  flake.modules.homeManager.primary-editor-neovim =
+    { pkgs, ... }:
+    {
+      imports = [ homeModules.neovim ];
+
+      home.sessionVariables = {
+        EDITOR = "nvim";
+        VISUAL = "nvim";
+      };
+      xdg.mimeApps.defaultApplicationPackages = [ pkgs.neovim ];
+    };
 }