Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/components/InteractiveInstaller.vue
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,11 @@ const envCmd = computed(() => {
if (selectedEnv.value === 'Wayland') {
if (selectedDe.value === 'KDE Plasma') {
vars = ['export XMODIFIERS=@im=fcitx', 'export GLFW_IM_MODULE=ibus'];
} else if (selectedDe.value === 'GNOME' || selectedDe.value === 'Sway') {
} else if (
selectedDe.value === 'GNOME' ||
selectedDe.value === 'Sway' ||
selectedDe.value === 'Halley'
) {
vars = [
'export XMODIFIERS=@im=fcitx',
'export QT_IM_MODULE=fcitx',
Expand Down Expand Up @@ -503,6 +507,12 @@ const chromiumWaylandFlags = computed(() =>
</ul>
</div>

<div v-if="waylandDeSpecific.code" class="code-container mini mt-2">
<CodeLines :code="waylandDeSpecific.code" />
<el-button class="copy-float" circle :icon="DocumentCopy" size="small"
@click="copyToClipboard(waylandDeSpecific.code)" />
</div>

<el-alert v-if="waylandDeSpecific.caveats" title="Lưu ý" type="warning" :closable="false"
class="mt-2">
<p style="margin: 0; line-height: 1.4; font-size: 0.85rem">
Expand Down
11 changes: 11 additions & 0 deletions src/data/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export const deWms = [
'Sway',
'Hyprland',
'Niri',
'Halley',
];
export const environments = ['X11', 'Wayland'];
export const initSystems = ['systemd', 'OpenRC', 'runit'];
Expand Down Expand Up @@ -246,6 +247,8 @@ export const logic = {
Hyprland:
'Thêm `hl.exec_cmd("fcitx5 -d")` vào ~/.config/hypr/hyprland.lua',
Niri: 'Thêm `spawn-sh-at-startup "fcitx5 -d"` vào ~/.config/niri/config.kdl',
Halley:
'Thêm `once "fcitx5 -d"` vào khối `autostart:` trong ~/.config/halley/halley.rune',
},
wayland_extras: {
General: {
Expand All @@ -266,6 +269,14 @@ export const logic = {
caveats:
'niri không hỗ trợ Xorg trực tiếp. Hãy cài chung với xwayland-satellite',
},
Halley: {
best_setup: [
'Halley chặn IME mặc định. Chạy lệnh sau để tự tạo systemd drop-in cấp quyền cho Fcitx5:',
],
code: "mkdir -p ~/.config/systemd/user/halley.service.d\ncat > ~/.config/systemd/user/halley.service.d/ime.conf <<'EOF'\n[Service]\nEnvironment=HALLEY_ALLOW_INPUT_METHOD=/usr/bin/fcitx5\nEnvironment=HALLEY_ALLOW_VIRTUAL_KEYBOARD=/usr/bin/fcitx5\nEOF\nsystemctl --user daemon-reload",
caveats:
'Sau khi sửa cần phải logout và login mới hoạt động.',
},
},
},
};
Expand Down
Loading