From 147b629caf62e6a5057025f0a45757d7358eb614 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= <msyds@deertopia.net>
Date: Thu, 4 Sep 2025 09:18:54 -0600
Subject: [PATCH] feat: Flake

---
 README.md                                     | 13 +---
 flake.lock                                    | 61 +++++++++++++++++++
 flake.nix                                     | 17 ++++++
 ...pia.Fcitx5.Addon.SydTables.metainfo.xml.in |  1 +
 package.nix                                   |  6 +-
 5 files changed, 85 insertions(+), 13 deletions(-)
 create mode 100644 flake.lock
 create mode 100644 flake.nix

diff --git a/README.md b/README.md
index 259de12..dacb98c 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@ The CMake code was nabbed directly from https://github.com/fcitx/fcitx5-table-ot
 
 ### With Nix
 
-I intend to set up a flake soonish.  For now, this can be installed into your
-NixOS/Home-manager configs with the following snippet:
+This can be installed into your NixOS/Home-manager configs:
 
 ```nix
 i18n.inputMethod = {
@@ -23,14 +22,8 @@ i18n.inputMethod = {
     addons = [
       # The package `fcitx5-chinese-addons` is *required*!!
       # See https://github.com/NixOS/nixpkgs/issues/126748.
-      pkgs.libsForQt5.fcitx5-chinese-addons
-      (let
-        repo = pkgs.fetchgit {
-          url = "https://gitlab.com/msyds/syd-fcitx5-tables";
-          tag = "v1.1.0";
-          hash = "sha256-Ndm+XUMFmkcrVH9tLvyiXP4gvShx3ELrURYdp2KfOyQ=";
-        };
-      in pkgs.callPackage "${repo}/package.nix" {})
+      pkgs.kdePackages.fcitx5-chinese-addons
+      inputs.syd-fcitx5-tables.packages.${system}.default
     ];
   };
 };
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..687bd22
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1756819007,
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..bdbfce5
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,17 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, ... }@inputs:
+    inputs.flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = inputs.nixpkgs.legacyPackages.${system};
+      in {
+        packages = rec {
+          syd-fcitx5-tables = pkgs.callPackage ./package.nix {};
+          default = syd-fcitx5-tables;
+        };
+      });
+}
diff --git a/net.deertopia.Fcitx5.Addon.SydTables.metainfo.xml.in b/net.deertopia.Fcitx5.Addon.SydTables.metainfo.xml.in
index ef57f82..fca34f8 100644
--- a/net.deertopia.Fcitx5.Addon.SydTables.metainfo.xml.in
+++ b/net.deertopia.Fcitx5.Addon.SydTables.metainfo.xml.in
@@ -16,6 +16,7 @@
     <release version="1.0.0" date="2025-07-17"/>
     <release version="1.1.0" date="2025-08-13"/>
     <release version="1.2.0" date="2025-09-04"/>
+    <release version="1.2.1" date="2025-09-04"/>
   </releases>
   <content_rating type="oars-1.1"/>
 </component>
diff --git a/package.nix b/package.nix
index d2e3b7f..ef3a5f2 100644
--- a/package.nix
+++ b/package.nix
@@ -4,14 +4,14 @@
 , libime
 , boost
 , fcitx5
-, libsForQt5
+, kdePackages
 , cmake
 , extra-cmake-modules
 }:
 
 stdenv.mkDerivation rec {
   pname = "syd-fcitx5-tables";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = ./.;
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
     # Provides the table engine, without which this package is useless.  See
     # Nixpkgs issue #126748.
-    libsForQt5.fcitx5-chinese-addons
+    kdePackages.fcitx5-chinese-addons
   ];
 
   meta = with lib; {