Skip to content

Commit be4f3a2

Browse files
committed
feat: add fcitx5 support to the image + default user service
Signed-off-by: Tulip Blossom <tulilirockz@outlook.com>
1 parent 1fc34ab commit be4f3a2

File tree

8 files changed

+43
-1
lines changed

8 files changed

+43
-1
lines changed

Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
2828
/ctx/build/99-cleanup.sh
2929

3030
# This is handy for VM testing
31-
# RUN usermod -p "$(echo "changeme" | mkpasswd -s)" root
31+
RUN usermod -p "$(echo "changeme" | mkpasswd -s)" root
3232

3333
RUN rm -rf /var/* && mkdir /var/tmp && bootc container lint

build_files/01-theme.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@ dnf -y install \
7979
xdg-desktop-portal-gtk \
8080
xdg-user-dirs \
8181
xwayland-satellite
82+
83+
# we already have a service for handling fcitx5
84+
rm -f /usr/share/applications/fcitx5-wayland-launcher.desktop
85+
rm -f /usr/share/applications/org.fcitx.Fcitx5*.desktop
86+
87+
# just breaks ostree deployments
8288
rm -rf /usr/share/doc/just
8389

8490
dnf install -y --setopt=install_weak_deps=False \
@@ -120,6 +126,7 @@ systemctl enable --global chezmoi-init.service
120126
systemctl enable --global chezmoi-update.timer
121127
systemctl enable --global dms.service
122128
systemctl enable --global foot-server.service
129+
systemctl enable --global fcitx5.service
123130
systemctl enable --global gnome-keyring-daemon.service
124131
systemctl enable --global gnome-keyring-daemon.socket
125132
systemctl enable --global iio-niri.service
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
export IMSETTINGS_MODULE=fcitx
2+
export GLFW_IM_MODULE=fcitx
3+
export SDL_IM_MODULE=fcitx
4+
export QT_IM_MODULE=fcitx
5+
export INPUT_METHOD=fcitx
6+
export XMODIFIERS="@im=fcitx"
7+
export GTK_IM_MODULE=

system_files/etc/profile.d/zfetch.sh

100644100755
File mode changed.

system_files/etc/profile.d/zmotd.sh

100644100755
File mode changed.

system_files/usr/lib/systemd/user-preset/01-zirconium.preset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ enable chezmoi-init.service
33
enable chezmoi-update.timer
44
enable foot-server.service
55
enable iio-niri.service
6+
enable fcitx5.service
67
enable udiskie.service
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[Unit]
2+
Description=Input method service
3+
PartOf=graphical-session.target
4+
After=graphical-session.target
5+
6+
[Service]
7+
ExecStart=fcitx5
8+
Restart=on-failure
9+
RestartSec=1
10+
11+
[Install]
12+
WantedBy=graphical-session.target

system_files/usr/share/zirconium/just/00-start.just

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,21 @@ toggle-autorotation:
5050
exit 0
5151
fi
5252

53+
toggle-fcitx5:
54+
#!/usr/bin/env bash
55+
56+
if systemctl is-enabled --quiet --user fcitx5 ; then
57+
systemctl disable --now --user fcitx5.service
58+
systemctl mask --now --user fcitx5.service
59+
echo "Disabled fcitx5"
60+
exit 0
61+
else
62+
systemctl unmask --user fcitx5.service
63+
systemctl enable --now --user fcitx5.service
64+
echo "Enabled fcitx5"
65+
exit 0
66+
fi
67+
5368
preinstalled-flatpaks:
5469
#!/usr/bin/env bash
5570
flatpak preinstall --reinstall

0 commit comments

Comments
 (0)