From 424afb3ad417d1bd2d37dbe74acdfc336900979f Mon Sep 17 00:00:00 2001
From: Ulic-youthlic <ulic.youthlic@gmail.com>
Date: Fri, 10 Jan 2025 18:44:38 +0800
Subject: [PATCH] change fcitx5 config to pkg, use rime-ice default config.

---
 .../configurations/Tytonidae/default.nix      |  1 -
 .../configurations/Tytonidae/rime-ice.nix     | 40 -------------------
 nixos/configurations/Tytonidae/i18n.nix       | 11 ++---
 pkgs/default.nix                              | 11 ++++-
 4 files changed, 14 insertions(+), 49 deletions(-)
 delete mode 100644 home/david/configurations/Tytonidae/rime-ice.nix

diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix
index 143a994..aff5beb 100644
--- a/home/david/configurations/Tytonidae/default.nix
+++ b/home/david/configurations/Tytonidae/default.nix
@@ -10,7 +10,6 @@
   imports = [
     ./starship
     ./fish
-    ./rime-ice.nix
     ./firefox.nix
     ./foot
     ./ghostty
diff --git a/home/david/configurations/Tytonidae/rime-ice.nix b/home/david/configurations/Tytonidae/rime-ice.nix
deleted file mode 100644
index c1d7e08..0000000
--- a/home/david/configurations/Tytonidae/rime-ice.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ ... }:
-{
-  xdg.dataFile = {
-    "fcitx5/rime/default.custom.yaml".text = ''
-      patch:
-        __include: rime_ice_suggestion:/
-        schema_list:
-          - schema: double_pinyin_flypy
-    '';
-
-    "fcitx5/rime/rime_ice.custom.yaml".text = ''
-      patch:
-        "translator/dictionary": custom_dict
-    '';
-
-    "fcitx5/rime/custom_dict.dict.yaml".text = ''
-      # Rime dictionary
-      # encoding: utf-8
-
-      ---
-      name: custom_dict
-      version: "1.0"
-      sort: by_weight
-      use_preset_vocabulary: false
-      import_tables:
-        # https://github.com/iDvel/rime-ice/blob/main/rime_ice.dict.yaml
-        - cn_dicts/8105     # 字表
-        - cn_dicts/41448    # 大字表（按需启用）（启用时和 8105 同时启用并放在 8105 下面）
-        - cn_dicts/base     # 基础词库
-        - cn_dicts/ext      # 扩展词库
-        - cn_dicts/tencent  # 腾讯词向量（大词库，部署时间较长）
-        - cn_dicts/others   # 一些杂项
-
-        - zhwiki
-        - moegirl
-      ...
-    '';
-  };
-
-}
diff --git a/nixos/configurations/Tytonidae/i18n.nix b/nixos/configurations/Tytonidae/i18n.nix
index 91235ae..9f8576a 100644
--- a/nixos/configurations/Tytonidae/i18n.nix
+++ b/nixos/configurations/Tytonidae/i18n.nix
@@ -27,15 +27,12 @@
           fcitx5-configtool
           fcitx5-chinese-addons
           (fcitx5-rime.override {
-            rimeDataPkgs =
+            rimeDataPkgs = (
+              with (outputs.packages."${pkgs.system}");
               [
-                rime-data
-              ]
-              ++ (with (outputs.packages."${pkgs.system}"); [
                 rime-ice
-                rime-zhwiki
-                rime-moegirl
-              ]);
+              ]
+            );
           })
         ];
         waylandFrontend = true;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 64c1528..db05879 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -11,5 +11,14 @@
   let
     nur-xddxdd = (pkgs.callPackage "${inputs.nur-xddxdd}/default.nix" { });
   in
-  pkgs.lib.genAttrs [ "rime-ice" "rime-zhwiki" "rime-moegirl" ] (name: nur-xddxdd."${name}")
+  pkgs.lib.genAttrs [ "rime-zhwiki" "rime-moegirl" ] (name: nur-xddxdd."${name}")
+  // {
+    rime-ice = nur-xddxdd.rime-ice.overrideAttrs {
+      buildPhase = ''
+        runHook preBuild
+
+        runHook postBuild
+      '';
+    };
+  }
 )