From 3e144249649b98cb82c9563151ceca2a180366fa Mon Sep 17 00:00:00 2001
From: Nate Graham <nate@kde.org>
Date: Fri, 24 Jul 2026 18:12:04 -0600
Subject: [PATCH] Pre-install fcitx and CJKV add-ons

With this, we'll get fcitx and some important add-ons for CJKV input
from Flathub, like we do Firefox.

No environment variables for compatibility with XWayland-using apps are
set here; instead this is documented at
https://linux.kde.org/docs/cjkv-input/#fixing-compatibility-issues

If it's not too disruptive, we could set them here in the future.

Resolves #329
---
 mkosi.extra/usr/lib/install-flatpaks | 18 +++++++++++++++++-
 mkosi.postinst.chroot                |  8 +++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/mkosi.extra/usr/lib/install-flatpaks b/mkosi.extra/usr/lib/install-flatpaks
index 6fa2584..487d3e9 100755
--- a/mkosi.extra/usr/lib/install-flatpaks
+++ b/mkosi.extra/usr/lib/install-flatpaks
@@ -4,4 +4,20 @@
 
 set -eux
 
-flatpak install --noninteractive --assumeyes --sideload-repo=/usr/share/factory/var/lib/flatpak/.ostree/repo org.gtk.Gtk3theme.Breeze org.kde.gwenview org.kde.okular org.kde.kwrite org.kde.haruna org.kde.qrca org.kde.ark org.kde.kcalc org.kde.keepsecret org.mozilla.firefox
+flatpak install --noninteractive --assumeyes --sideload-repo=/usr/share/factory/var/lib/flatpak/.ostree/repo \
+org.gtk.Gtk3theme.Breeze \
+org.kde.gwenview \
+org.kde.okular \
+org.kde.kwrite \
+org.kde.haruna \
+org.kde.qrca \
+org.kde.ark \
+org.kde.kcalc \
+org.kde.keepsecret \
+org.mozilla.firefox \
+org.fcitx.Fcitx5 \
+org.fcitx.Fcitx5.Addon.ChineseAddons \
+org.fcitx.Fcitx5.Addon.Chewing \
+org.fcitx.Fcitx5.Addon.Mozc \
+org.fcitx.Fcitx5.Addon.Hangul \
+org.fcitx.Fcitx5.Addon.Unikey \
diff --git a/mkosi.postinst.chroot b/mkosi.postinst.chroot
index 8e59ceb..e32e00d 100755
--- a/mkosi.postinst.chroot
+++ b/mkosi.postinst.chroot
@@ -114,7 +114,13 @@ download_flatpaks() {
     flatpak install --or-update --noninteractive --assumeyes flathub \
         org.gtk.Gtk3theme.Breeze \
         org.kde.kwrite \
-        org.mozilla.firefox
+        org.mozilla.firefox \
+        org.fcitx.Fcitx5 \
+        org.fcitx.Fcitx5.Addon.ChineseAddons \
+        org.fcitx.Fcitx5.Addon.Chewing \
+        org.fcitx.Fcitx5.Addon.Mozc \
+        org.fcitx.Fcitx5.Addon.Hangul \
+        org.fcitx.Fcitx5.Addon.Unikey \
 
     # And restore default
     flatpak config --unset languages