feat: Add rime-all package for all rime plugins

flake/perSystem.nix

@@ -47,14 +47,16 @@
             inherit inputs rootPath;
             srcs = self.callPackage (rootPath + "/_sources/generated.nix") { };
             inherit (inputs'.nixvim.legacyPackages) makeNixvim makeNixvimWithModule;
-            inherit (self'.legacyPackages) nixvimPlugins editor-runtime;
             neovim_git = inputs'.neovim-nightly.packages.default;
           });
         in
-        lib.packagesFromDirectoryRecursive {
-          inherit (inputsScope) callPackage;
-          directory = rootPath + "/pkgs";
-        };
+        inputsScope.overrideScope (
+          final: _prev:
+          lib.packagesFromDirectoryRecursive {
+            inherit (final) callPackage;
+            directory = rootPath + "/pkgs";
+          }
+        );
       packages =
         let
           flattenPkgs =
@@ -68,7 +70,23 @@
             else
               { };
         in
-        flattenPkgs [ ] self'.legacyPackages;
+        flattenPkgs [ ] (
+          lib.removeAttrs self'.legacyPackages [
+            "inputs"
+
+            "srcs"
+
+            "rootPath"
+
+            "makeNixvim"
+            "makeNixvimWithModule"
+
+            "newScope"
+            "overrideScope"
+            "packages"
+            "callPackage"
+          ]
+        );
       checks = lib.concatMapAttrs (name: value: {
         "package-${name}" = value;
       }) self'.packages;

home/modules/i18n/default.nix

@@ -1,14 +0,0 @@
-{
-  osConfig ? null,
-  lib,
-  ...
-}:
-{
-  config = lib.mkIf (osConfig != null) {
-    xdg.dataFile = {
-      "fcitx5/rime/default.custom.yaml".source = ./default.custom.yaml;
-      "fcitx5/rime/double_pinyin_flypy.custom.yaml".source = ./double_pinyin_flypy.custom.yaml;
-      "fcitx5/rime/yustar_sc.custom.yaml".source = ./yustar_sc.custom.yaml;
-    };
-  };
-}

nixos/modules/i18n.nix

@@ -37,10 +37,7 @@ in
             fcitx5-fluent
             (fcitx5-rime.override {
               rimeDataPkgs = [
-                rime-ice
-                rime-zhwiki
-                rime-moegirl
-                rime-yuhaostar
+                rime-all
               ];
             })
           ];

overlays/additions/default.nix

@@ -9,6 +9,7 @@ in
   ./editor-runtime.nix
   ./wallpapers.nix
   ./rime-yuhaostar.nix
+  ./rime-all.nix
   ./nixvim.nix
   ./doom-emacs.nix
   ./osu-lazer-bin.nix # typochecker: disable-line

overlays/additions/rime-all.nix

@@ -0,0 +1,8 @@
+{ outputs, ... }:
+_final: prev:
+let
+  inherit (prev.stdenv.hostPlatform) system;
+in
+{
+  inherit (outputs.packages.${system}) rime-all;
+}

overlays/modifications/cliphist.nix

@@ -4,5 +4,5 @@ let
   inherit (prev.stdenv.hostPlatform) system;
 in
 {
-  inherit (outputs.packages."${system}") cliphist;
+  inherit (outputs.packages."${system}") cliphist';
 }

overlays/modifications/radicle-explorer.nix

@@ -4,5 +4,5 @@ let
   inherit (prev.stdenv.hostPlatform) system;
 in
 {
-  radicle-explorer = outputs.packages."${system}".radicle-explorer;
+  radicle-explorer = outputs.packages."${system}".radicle-explorer';
 }

overlays/modifications/spotifyd.nix

@@ -4,5 +4,5 @@ let
   inherit (prev.stdenv.hostPlatform) system;
 in
 {
-  spotifyd = outputs.packages."${system}".spotifyd;
+  spotifyd = outputs.packages.${system}.spotifyd';
 }

pkgs/rime-all/package.nix

@@ -0,0 +1,21 @@
+{
+  rime-ice,
+  rime-yuhaostar,
+  rime-moegirl,
+  rime-zhwiki,
+  buildEnv,
+}:
+buildEnv {
+  name = "rime-all";
+  paths = [
+    rime-ice
+    rime-yuhaostar
+    rime-zhwiki
+    rime-moegirl
+  ];
+  postBuild = ''
+    ln -s ${./yustar_sc.custom.yaml} $out/share/rime-data/yustar_sc.custom.yaml
+    ln -s ${./double_pinyin_flypy.custom.yaml} $out/share/rime-data/double_pinyin_flypy.custom.yaml
+    ln -s ${./default.custom.yaml} $out/share/rime-data/default.custom.yaml
+  '';
+}

pkgs/spotifyd'.nix

@@ -8,7 +8,7 @@ let
   inherit (srcs.spotifyd) src date version;
 in
 spotifyd.overrideAttrs (
-  final: prev: {
+  _final: prev: {
     inherit src;
     version =
       if prev.version != "0.4.1" then
@@ -18,7 +18,7 @@ spotifyd.overrideAttrs (
       else
         "0-unstable-${date}-git${version}";
     cargoDeps = rustPlatform.fetchCargoVendor {
-      inherit (final)
+      inherit (prev)
         src
         ;
       hash = "sha256-WwShp1ebk89cBqRXqKDgbwGZraCDjQAOxoL4uEIq2aw=";