From 6a3473813de9655420e2aff02fe9992636472f3f Mon Sep 17 00:00:00 2001
From: ulic-youthlic <ulic.youthlic@gmail.com>
Date: Mon, 9 Jun 2025 15:30:31 +0800
Subject: [PATCH] Move all editor runtime deps into package `editor-runtime`

---
 home/david/modules/programs/helix.nix | 37 +------------
 home/modules/programs/zed.nix         | 36 +-----------
 overlays/additions/default.nix        |  1 +
 overlays/additions/editor-runtime.nix |  5 ++
 pkgs/default.nix                      |  1 +
 pkgs/editor-runtime.nix               | 80 +++++++++++++++++++++++++++
 6 files changed, 89 insertions(+), 71 deletions(-)
 create mode 100644 overlays/additions/editor-runtime.nix
 create mode 100644 pkgs/editor-runtime.nix

diff --git a/home/david/modules/programs/helix.nix b/home/david/modules/programs/helix.nix
index 95eb838..170499f 100644
--- a/home/david/modules/programs/helix.nix
+++ b/home/david/modules/programs/helix.nix
@@ -15,42 +15,7 @@ in {
     youthlic.programs.helix = {
       enable = true;
       extraPackages = with pkgs; [
-        nixfmt-rfc-style
-        idris2Packages.idris2Lsp
-        lua-language-server
-        bash-language-server
-        shfmt
-        hurl
-        cmake-language-server
-        kdlfmt
-        rustfmt
-        clang-tools
-        libxml2
-        typstyle
-        pyright
-        ruff
-        gotools
-        yaml-language-server
-        taplo
-        markdown-oxide
-        marksman
-        nixd
-        deno
-        alejandra
-        vscode-langservers-extracted
-        fish-lsp
-        tailwindcss-language-server
-        gopls
-        golangci-lint-langserver
-        tinymist
-        delve
-        lldb
-        rust-analyzer
-        # nil
-        haskell-language-server
-        neocmakelsp
-        jdt-language-server
-        zls
+        editor-runtime
       ];
     };
   };
diff --git a/home/modules/programs/zed.nix b/home/modules/programs/zed.nix
index 31dfde0..b8935d3 100644
--- a/home/modules/programs/zed.nix
+++ b/home/modules/programs/zed.nix
@@ -48,41 +48,7 @@ in {
         "zig"
       ];
       extraPackages = with pkgs; [
-        idris2Packages.idris2Lsp
-        lua-language-server
-        bash-language-server
-        shfmt
-        hurl
-        cmake-language-server
-        kdlfmt
-        rustfmt
-        clang-tools
-        libxml2
-        typstyle
-        pyright
-        ruff
-        gotools
-        yaml-language-server
-        taplo
-        markdown-oxide
-        marksman
-        nixd
-        deno
-        alejandra
-        vscode-langservers-extracted
-        fish-lsp
-        tailwindcss-language-server
-        gopls
-        golangci-lint-langserver
-        tinymist
-        delve
-        lldb
-        rust-analyzer
-        # nil
-        haskell-language-server
-        neocmakelsp
-        jdt-language-server
-        zls
+        editor-runtime
       ];
       userSettings = {
         languages = {
diff --git a/overlays/additions/default.nix b/overlays/additions/default.nix
index 1c72bfd..02467d9 100644
--- a/overlays/additions/default.nix
+++ b/overlays/additions/default.nix
@@ -5,6 +5,7 @@ in
     ./rime-ice.nix
     ./TrackersListCollection.nix
     ./OuterWildsTextAdventure.nix
+    ./editor-runtime.nix
   ]
   |> map (file: import file args)
   |> (overlays: (lib.composeManyExtensions overlays) final prev)
diff --git a/overlays/additions/editor-runtime.nix b/overlays/additions/editor-runtime.nix
new file mode 100644
index 0000000..c23213a
--- /dev/null
+++ b/overlays/additions/editor-runtime.nix
@@ -0,0 +1,5 @@
+{outputs, ...}: final: prev: let
+  inherit (prev.stdenv.hostPlatform) system;
+in {
+  inherit (outputs.packages.${system}) editor-runtime;
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 94d4ac2..4e4be55 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -19,6 +19,7 @@ in
     wshowkeys-mao = callPackage ./wshowkeys-mao.nix {};
     OuterWildsTextAdventure = callPackage ./OuterWildsTextAdventure.nix {};
     QQ = callPackage ./QQ.nix {};
+    editor-runtime = callPackage ./editor-runtime.nix {};
 
     noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
     noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};
diff --git a/pkgs/editor-runtime.nix b/pkgs/editor-runtime.nix
new file mode 100644
index 0000000..13ac950
--- /dev/null
+++ b/pkgs/editor-runtime.nix
@@ -0,0 +1,80 @@
+{
+  symlinkJoin,
+  nixfmt-rfc-style,
+  idris2Packages,
+  lua-language-server,
+  bash-language-server,
+  shfmt,
+  hurl,
+  cmake-language-server,
+  kdlfmt,
+  rustfmt,
+  clang-tools,
+  libxml2,
+  typstyle,
+  pyright,
+  ruff,
+  gotools,
+  yaml-language-server,
+  taplo,
+  markdown-oxide,
+  marksman,
+  nixd,
+  deno,
+  alejandra,
+  vscode-langservers-extracted,
+  fish-lsp,
+  tailwindcss-language-server,
+  gopls,
+  golangci-lint-langserver,
+  tinymist,
+  delve,
+  lldb,
+  rust-analyzer,
+  # nil,
+  haskell-language-server,
+  neocmakelsp,
+  jdt-language-server,
+  zls,
+}:
+symlinkJoin {
+  name = "editor-runtime";
+  paths = [
+    nixfmt-rfc-style
+    idris2Packages.idris2Lsp
+    lua-language-server
+    bash-language-server
+    shfmt
+    hurl
+    cmake-language-server
+    kdlfmt
+    rustfmt
+    clang-tools
+    libxml2
+    typstyle
+    pyright
+    ruff
+    gotools
+    yaml-language-server
+    taplo
+    markdown-oxide
+    marksman
+    nixd
+    deno
+    alejandra
+    vscode-langservers-extracted
+    fish-lsp
+    tailwindcss-language-server
+    gopls
+    golangci-lint-langserver
+    tinymist
+    delve
+    lldb
+    rust-analyzer
+    # nil
+    haskell-language-server
+    neocmakelsp
+    jdt-language-server
+    zls
+  ];
+}