package rime-ice

flake.lock

@@ -763,23 +763,6 @@
         "type": "gitlab"
       }
     },
-    "nur-xddxdd": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1741601101,
-        "narHash": "sha256-dXEy/blI2XGjnTfvNQxCLMpaAEE0eDL7Ai9CzJvdWFE=",
-        "owner": "xddxdd",
-        "repo": "nur-packages",
-        "rev": "c059e437606d78b128b38dda04e7c222284362d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "xddxdd",
-        "ref": "master",
-        "repo": "nur-packages",
-        "type": "github"
-      }
-    },
     "oskars-dotfiles": {
       "flake": false,
       "locked": {
@@ -820,7 +803,6 @@
         "nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f": "nixpkgs-845dc1e9cbc2e48640b8968af58b4a19db67aa8f",
         "nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1": "nixpkgs-e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
         "nur-rycee": "nur-rycee",
-        "nur-xddxdd": "nur-xddxdd",
         "oskars-dotfiles": "oskars-dotfiles",
         "sops-nix": "sops-nix",
         "stylix": "stylix"

flake.nix

@@ -113,14 +113,6 @@
       repo = "flake-utils";
     };
 
-    nur-xddxdd = {
-      type = "github";
-      owner = "xddxdd";
-      repo = "nur-packages";
-      ref = "master";
-      flake = false;
-    };
-
     nur-rycee = {
       type = "gitlab";
       owner = "rycee";

nixos/modules/i18n.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  outputs,
   lib,
   config,
   ...
@@ -35,17 +34,11 @@ in
           addons = with pkgs; [
             libsForQt5.fcitx5-qt
             fcitx5-gtk
-            fcitx5-configtool
             fcitx5-fluent
             (fcitx5-rime.override {
-              rimeDataPkgs = (
+              rimeDataPkgs = [
-                with (outputs.packages."${pkgs.system}");
+                rime-ice
-                [
+              ];
-                  rime-ice
-                  rime-zhwiki
-                  rime-moegirl
-                ]
-              );
             })
           ];
           waylandFrontend = true;

overlays/additions/default.nix

@@ -2,8 +2,9 @@
 final: prev:
 let
   inherit (prev) lib;
-  overlay-files = [
-  ];
-  overlay-list = map (file: import file args) overlay-files;
 in
-(lib.composeManyExtensions overlay-list) final prev
+[
+  ./rime-ice.nix
+]
+|> map (file: import file args)
+|> (overlays: (lib.composeManyExtensions overlays) final prev)

overlays/additions/rime-ice.nix

@@ -0,0 +1,9 @@
+{ outputs, ... }:
+final: prev:
+let
+  inherit (final) stdenv;
+  inherit (stdenv.hostPlatform) system;
+in
+{
+  rime-ice = outputs.packages."${system}".rime-ice;
+}

pkgs/_sources/generated.json

@@ -19,6 +19,27 @@
         },
         "version": "4c5e8bd948ba2f72a0dd38681cf13ae532f6c9f5"
     },
+    "rime-ice": {
+        "cargoLocks": null,
+        "date": "2025-03-11",
+        "extract": null,
+        "name": "rime-ice",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "iDvel",
+            "repo": "rime-ice",
+            "rev": "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7",
+            "sha256": "sha256-/sKoufIf4m5h1Zds6AqIyeCjDaZsFU9ot5ln3ykuNyU=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7"
+    },
     "tree-sitter-idris": {
         "cargoLocks": null,
         "date": "2024-11-05",

pkgs/_sources/generated.nix

@@ -15,6 +15,18 @@
     };
     date = "2025-02-20";
   };
+  rime-ice = {
+    pname = "rime-ice";
+    version = "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7";
+    src = fetchFromGitHub {
+      owner = "iDvel";
+      repo = "rime-ice";
+      rev = "75b225e84f5e95ddf0b5a50fa6e2cff9800ee7b7";
+      fetchSubmodules = false;
+      sha256 = "sha256-/sKoufIf4m5h1Zds6AqIyeCjDaZsFU9ot5ln3ykuNyU=";
+    };
+    date = "2025-03-11";
+  };
   tree-sitter-idris = {
     pname = "tree-sitter-idris";
     version = "c56a25cf57c68ff929356db25505c1cc4c7820f6";

pkgs/default.nix

@@ -12,6 +12,7 @@ in
   pinentry-selector = callPackage ./pinentry-selector.nix { };
   helix = callPackage ./helix { };
   juicity = callPackage ./juicity.nix { };
+  rime-ice = callPackage ./rime-ice.nix { };
 }
 // (
   let
@@ -19,18 +20,3 @@ in
   in
   pkgs.lib.genAttrs [ "immersive-translate" "tridactyl" ] (name: firefox-addons."${name}")
 )
-// (
-  let
-    nur-xddxdd = (callPackage "${inputs.nur-xddxdd}/default.nix" { });
-  in
-  pkgs.lib.genAttrs [ "rime-zhwiki" "rime-moegirl" ] (name: nur-xddxdd."${name}")
-  // {
-    rime-ice = nur-xddxdd.rime-ice.overrideAttrs {
-      buildPhase = ''
-        runHook preBuild
-
-        runHook postBuild
-      '';
-    };
-  }
-)

pkgs/nvfetcher.toml

@@ -6,3 +6,7 @@ fetch.git = "https://githuh.com/juicity/juicity"
 src.git = "https://github.com/kayhide/tree-sitter-idris"
 fetch.git = "https://github.com/kayhide/tree-sitter-idris"
 passthru.name = "idris"
+
+[rime-ice]
+src.git = "https://github.com/iDvel/rime-ice.git"
+fetch.github = "iDvel/rime-ice"

pkgs/rime-ice.nix

@@ -0,0 +1,16 @@
+{ srcs, stdenvNoCC, ... }:
+let
+  source = srcs.rime-ice;
+in
+stdenvNoCC.mkDerivation {
+  inherit (source) pname version src;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/rime-data
+    cp -r * $out/share/rime-data/
+
+    runHook postInstall
+  '';
+}