From b13a985d87c138ee6f2e0e6dd763b41908f6cfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= <msyds@deertopia.net>
Date: Sun, 15 Mar 2026 16:36:09 -0600
Subject: [PATCH] refactor(toki-pona): all in one module

---
 modules/home/toki-pona.nix                             | 10 +++++++++-
 .../crumb/fcitx5 => toki-pona}/punctuation.patch       |  0
 modules/home/users/crumb/fcitx5.nix                    |  5 -----
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename modules/home/{users/crumb/fcitx5 => toki-pona}/punctuation.patch (100%)

diff --git a/modules/home/toki-pona.nix b/modules/home/toki-pona.nix
index df99139..a06e581 100644
--- a/modules/home/toki-pona.nix
+++ b/modules/home/toki-pona.nix
@@ -3,10 +3,18 @@
 let cfg = config.sydnix.toki-pona;
 in {
   options.sydnix.toki-pona = {
-    enable = lib.mkEnableOption "Toki Pona fonts";
+    enable = lib.mkEnableOption "Toki Pona fonts, input, and spell-check";
   };
 
   config = lib.mkIf cfg.enable {
+    i18n.inputMethod.fcitx5.addons = [
+      (pkgs.fcitx5-toki-pona.overrideAttrs (final: prev: {
+        patches = prev.patches or [] ++ [
+          ./toki-pona/punctuation.patch
+        ];
+      }))
+    ];
+
     home.packages = with pkgs; [
       # nasin-nanpa-ucsur
       nasin-nanpa
diff --git a/modules/home/users/crumb/fcitx5/punctuation.patch b/modules/home/toki-pona/punctuation.patch
similarity index 100%
rename from modules/home/users/crumb/fcitx5/punctuation.patch
rename to modules/home/toki-pona/punctuation.patch
diff --git a/modules/home/users/crumb/fcitx5.nix b/modules/home/users/crumb/fcitx5.nix
index 748e096..9eb9739 100644
--- a/modules/home/users/crumb/fcitx5.nix
+++ b/modules/home/users/crumb/fcitx5.nix
@@ -18,11 +18,6 @@ in {
           pkgs.kdePackages.fcitx5-chinese-addons
           pkgs.fcitx5-hangul
           inputs.syd-fcitx5-tables.packages.${system}.default
-          (pkgs.fcitx5-toki-pona.overrideAttrs (final: prev: {
-	    patches = prev.patches or [] ++ [
-	      ./fcitx5/punctuation.patch
-	    ];
-	  }))
         ];
         settings = {
           # Bind QuickPhrase to `s-;`.