From 76ed0c10f43ee3e56bdcbff0583db1fd87c9304b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Fri, 20 Jun 2025 12:06:21 +0200
Subject: [PATCH] overlays: move fcitx5-table-extra patch to top-level

---
 nix/configurations/vanadium.nix               |  1 +
 nix/configurations/vanadium/overlay.nix       | 11 -----------
 nix/overlays/fcitx5-table-extra-taiwanese.nix | 18 ++++++++++++++++++
 npins/sources.json                            | 13 +++++++++++++
 4 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 nix/overlays/fcitx5-table-extra-taiwanese.nix

diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix
index c89b82e6..203dc8a2 100644
--- a/nix/configurations/vanadium.nix
+++ b/nix/configurations/vanadium.nix
@@ -49,6 +49,7 @@ in
             ../overlays/nix-tree.nix
             ../overlays/wallpapers.nix
             ../overlays/nil.nix
+            ../overlays/fcitx5-table-extra-taiwanese.nix
 
             ../overlays/iosevka.nix
             ../packages/overlay.nix
diff --git a/nix/configurations/vanadium/overlay.nix b/nix/configurations/vanadium/overlay.nix
index f0012aa7..bf42647e 100644
--- a/nix/configurations/vanadium/overlay.nix
+++ b/nix/configurations/vanadium/overlay.nix
@@ -47,15 +47,4 @@ in
       ./patches/fcitx5-chinese-addons/disable-fullwidth.patch
       # Note: disabling pinyin helper breaks canjie
     ];
-    fcitx5-table-extra.__output.src = _: final.fetchFromGitHub {
-      owner = "leana8959";
-      repo = "fcitx5-table-extra";
-      rev = "3fb844280a5154389be17e422a98ad89cafccc38";
-      hash = "sha256-8iGNQYQH8tT3p6VedVBgfxHqXVLkFEiDEd1H7CBFXqg=";
-      fetchSubmodules = true;
-    };
-    fcitx5-table-extra.__output.nativeBuildInputs.__append = [ final.python3 ];
-    fcitx5-table-extra.__output.preConfigure.__prepend = ''
-      python3 ./generate.py
-    '';
   })
diff --git a/nix/overlays/fcitx5-table-extra-taiwanese.nix b/nix/overlays/fcitx5-table-extra-taiwanese.nix
new file mode 100644
index 00000000..3fdad750
--- /dev/null
+++ b/nix/overlays/fcitx5-table-extra-taiwanese.nix
@@ -0,0 +1,18 @@
+let
+  sources = import ../sources.nix;
+in
+  final: prev: {
+    fcitx5-table-extra = prev.fcitx5-table-extra.overrideAttrs (oldAttrs: {
+      src = sources.fcitx5-table-extra;
+      nativeBuildInputs =
+        oldAttrs.nativeBuildInputs or []
+        ++ [
+          final.python3
+        ];
+      preConfigure =
+        oldAttrs.preConfigure or ""
+        + ''
+          python3 ./generate.py
+        '';
+    });
+  }
diff --git a/npins/sources.json b/npins/sources.json
index 4a976440..f8adf4ed 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -34,6 +34,19 @@
       "hash": "13brimg7z7k9y36n4jc1pssqyw94nd8qvgfjv53z66lv4xkhin92",
       "frozen": true
     },
+    "fcitx5-table-extra": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "leana8959",
+        "repo": "fcitx5-table-extra"
+      },
+      "branch": "taiwanese",
+      "submodules": true,
+      "revision": "48a7a51516302e070479156b54d2911ba9fbfce8",
+      "url": null,
+      "hash": "07d2mzjnggbxlpqarcj65xdndkqxcab38lkbbqh65cyfqzqahdg0"
+    },
     "home-manager": {
       "type": "Git",
       "repository": {