Skip to content

feat: migrate fcitx5 to flatpak and preinstall it in the future #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
renner0e wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: migrate fcitx5 to flatpak and preinstall it in the future #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions system_files/shared/usr/lib/tmpfiles.d/krita-flatpak.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
L /var/lib/flatpak/overrides/org.kde.krita - - - - /usr/share/factory/var/lib/flatpak/overrides/org.kde.krita
1 change: 1 addition & 0 deletions system_files/shared/usr/lib/tmpfiles.d/steam-flatpak.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
L /var/lib/flatpak/overrides/com.valvesoftware.Steam - - - - /usr/share/factory/var/lib/flatpak/overrides/com.valvesoftware.Steam
7 changes: 7 additions & 0 deletions system_files/shared/usr/share/factory/var/lib/flatpak/overrides/com.valvesoftware.Steam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# https://linux.kde.org/docs/cjkv-input/#fixing-compatibility-issues
# https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#KDE_Plasma
# https://github.com/ublue-os/aurora/issues/3038
[Environment]
GTK_IM_MODULE=xim
QT_IM_MODULE=xim
QT_IM_MODULES=wayland;fcitx;ibus
7 changes: 7 additions & 0 deletions system_files/shared/usr/share/factory/var/lib/flatpak/overrides/org.kde.krita
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# https://linux.kde.org/docs/cjkv-input/#fixing-compatibility-issues
# https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland#KDE_Plasma
# https://github.com/ublue-os/aurora/issues/3038
[Environment]
GTK_IM_MODULE=xim
QT_IM_MODULE=xim
QT_IM_MODULES=wayland;fcitx;ibus
24 changes: 24 additions & 0 deletions system_files/shared/usr/share/flatpak/preinstall.d/fcitx5.preinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# part of https://github.com/ublue-os/aurora/issues/3038
[Flatpak Preinstall org.fcitx.Fcitx5]
Branch=stable
IsRuntime=false

[Flatpak Preinstall org.fcitx.Fcitx5.Addon.Chewing]
Branch=stable
IsRuntime=true

[Flatpak Preinstall org.fcitx.Fcitx5.Addon.ChineseAddons]
Branch=stable
IsRuntime=true

[Flatpak Preinstall org.fcitx.Fcitx5.Addon.Hangul]
Branch=stable
IsRuntime=true

[Flatpak Preinstall org.fcitx.Fcitx5.Addon.Mozc]
Branch=stable
IsRuntime=true

[Flatpak Preinstall org.fcitx.Fcitx5.Addon.Unikey]
Branch=stable
IsRuntime=true
6 changes: 6 additions & 0 deletions system_files/shared/usr/share/ublue-os/homebrew/system-flatpaks.Brewfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ flatpak "io.github.flattool.Warehouse"
flatpak "io.github.kolunmi.Bazaar"
flatpak "io.missioncenter.MissionCenter"
flatpak "org.deskflow.deskflow"
flatpak "org.fcitx.Fcitx5"
flatpak "org.fcitx.Fcitx5.Addon.Chewing"
flatpak "org.fcitx.Fcitx5.Addon.ChineseAddons"
flatpak "org.fcitx.Fcitx5.Addon.Hangul"
flatpak "org.fcitx.Fcitx5.Addon.Mozc"
flatpak "org.fcitx.Fcitx5.Addon.Unikey"
flatpak "org.fedoraproject.MediaWriter"
flatpak "org.fkoehler.KTailctl"
flatpak "org.gnome.DejaDup"
Expand Down
28 changes: 27 additions & 1 deletion system_files/shared/usr/share/ublue-os/user-setup.hooks.d/40-flatpak.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,33 @@
set -euo pipefail

source /usr/lib/ublue/setup-services/libsetup.sh
version-script aurora-flatpak user 1 || exit 0
version-script aurora-flatpak user 2 || exit 0

# https://github.com/ublue-os/aurora/issues/3038
migrate_fcitx() {
LOCAL_UBLUE_DIR="${XDG_DATA_HOME:-${HOME}/.local/share}/ublue"
ID="org.fcitx.Fcitx5"
FCITX_CONFIG_DIR="${HOME}/.config/fcitx5"
FCITX_DATA_DIR="${HOME}/.local/share/fcitx5"

FCITX_FLATPAK="${HOME}/.var/app/${ID}/"
FCITX_DATA_DIR_FLATPAK="${FCITX_FLATPAK}/data"
FCITX_CONFIG_DIR_FLATPAK="${FCITX_FLATPAK}/config"

# don't overwrite/do anything if user already has flatpak fcitx for whatever reason
if [[ ! -f "${LOCAL_UBLUE_DIR}/fcitx5-flatpak-migration" ]] && [[ -d "/var/lib/flatpak/app/${ID}" ]] && [[ ! -d "${FCITX_CONFIG_DIR_FLATPAK}" ]]; then
if [[ -d "${FCITX_CONFIG_DIR}" ]]; then
cp -r "${FCITX_CONFIG_DIR}" "${FCITX_CONFIG_DIR_FLATPAK}"
fi

if [[ -d "${FCITX_DATA_DIR}" ]] && [[ -n "$(ls -A "${FCITX_DATA_DIR}" 2>/dev/null)" ]]; then
cp -r "${FCITX_DATA_DIR}" "${FCITX_DATA_DIR_FLATPAK}"
fi
touch "${LOCAL_UBLUE_DIR}/fcitx5-flatpak-migration"
fi
}

migrate_fcitx

# More consistent Qt/GTK themes for Flatpaks
flatpak override --user --filesystem=xdg-config/gtk-4.0:ro
Expand Down
Loading