8 files changed, 78 insertions, 49 deletions
diff --git a/dot-config/fcitx5/conf/chttrans.conf b/dot-config/fcitx5/conf/chttrans.conf
index d92e48a2..6f9c429a 100644
--- a/dot-config/fcitx5/conf/chttrans.conf
+++ b/dot-config/fcitx5/conf/chttrans.conf
@@ -1,9 +1,9 @@
 # Translate engine
 Engine=Native
 # OpenCC profile for Simplified to Traditional
-OpenCCS2TProfile=default
+# OpenCCS2TProfile=default
 # OpenCC profile for Traditional to Simplified
-OpenCCT2SProfile=default
+# OpenCCT2SProfile=default
 
 [Hotkey]
 0=Control+Alt+Shift+Super+T
diff --git a/dot-config/fcitx5/conf/jyutping.conf b/dot-config/fcitx5/conf/jyutping.conf
new file mode 100644
index 00000000..94f0f910
--- /dev/null
+++ b/dot-config/fcitx5/conf/jyutping.conf
@@ -0,0 +1,23 @@
+# Candidates Per Page
+# PageSize=5
+# Number of Predictions
+# PredictionSize=10
+# Enable Prediction
+# Prediction=False
+# Number of Sentences
+# Number of sentence=2
+# Use Inner Segment
+# InnerSegment=True
+
+[PrevPage]
+0=Control+K
+
+[NextPage]
+0=Control+J
+
+[PrevCandidate]
+0=Control+H
+
+[NextCandidate]
+0=Control+L
+
diff --git a/dot-config/fcitx5/conf/keyboard.conf b/dot-config/fcitx5/conf/keyboard.conf
index fbea7b6e..e6cfa793 100644
--- a/dot-config/fcitx5/conf/keyboard.conf
+++ b/dot-config/fcitx5/conf/keyboard.conf
@@ -1,25 +1,25 @@
-# Page size
+# Candidates per page
 PageSize=10
 # Prev Candidate
 PrevCandidate=
 # Next Candidate
 NextCandidate=
 # Enable emoji in hint
-EnableEmoji=True
+# EnableEmoji=True
 # Enable emoji in quickphrase
-EnableQuickPhraseEmoji=True
+# EnableQuickPhraseEmoji=True
 # Choose key modifier
 Choose Modifier=None
 # Enable hint by default
-EnableHintByDefault=False
+# EnableHintByDefault=False
 # Trigger hint mode
 Hint Trigger=
 # Trigger hint mode for one time
 One Time Hint Trigger=
 # Use new compose behavior
-UseNewComposeBehavior=True
+# UseNewComposeBehavior=True
 # Type special characters with long press
-EnableLongPress=False
+# EnableLongPress=False
 # Applications disabled for long press
 LongPressBlocklist=
 
diff --git a/dot-config/fcitx5/conf/punctuation.conf b/dot-config/fcitx5/conf/punctuation.conf
index d97ca528..a3c3eba5 100644
--- a/dot-config/fcitx5/conf/punctuation.conf
+++ b/dot-config/fcitx5/conf/punctuation.conf
@@ -3,7 +3,7 @@ Hotkey=
 # Half width punctuation after latin letter or number
 HalfWidthPuncAfterLetterOrNumber=False
 # Type paired punctuations together (e.g. Quote)
-TypePairedPunctuationsTogether=False
+# TypePairedPunctuationsTogether=False
 # Enabled
-Enabled=True
+# Enabled=True
 
diff --git a/dot-config/fcitx5/conf/rime.conf b/dot-config/fcitx5/conf/rime.conf
index 734c16d7..e90d7224 100644
--- a/dot-config/fcitx5/conf/rime.conf
+++ b/dot-config/fcitx5/conf/rime.conf
@@ -1,13 +1,15 @@
 # Preedit Mode
-PreeditMode="Composing text"
+# PreeditMode="Composing text"
 # Shared Input State
-InputState=All
+InputState="Follow Global Configuration"
 # Fix embedded preedit cursor at the beginning of the preedit
-PreeditCursorPositionAtBeginning=True
+# PreeditCursorPositionAtBeginning=True
 # Action when switching input method
 SwitchInputMethodBehavior="Commit raw input"
 # Deploy
-Deploy=
+# Deploy=
 # Synchronize
-Synchronize=
+# Synchronize=
+# Use latin mode name defined in schema
+# LatinModeNameFromSchema=False
 
diff --git a/dot-config/fcitx5/config b/dot-config/fcitx5/config
index 9265036c..3c2078a5 100644
--- a/dot-config/fcitx5/config
+++ b/dot-config/fcitx5/config
@@ -1,79 +1,78 @@
 [Hotkey]
 # Enumerate when holding modifier of Toggle key
-EnumerateWithTriggerKeys=True
+# EnumerateWithTriggerKeys=True
 # Temporarily Toggle Input Method
 AltTriggerKeys=
 # Enumerate Input Method Forward
-EnumerateForwardKeys=
+# EnumerateForwardKeys=
 # Enumerate Input Method Backward
-EnumerateBackwardKeys=
+# EnumerateBackwardKeys=
 # Skip first input method while enumerating
-EnumerateSkipFirst=False
+# EnumerateSkipFirst=False
 # Enumerate Input Method Group Forward
 EnumerateGroupForwardKeys=
 # Enumerate Input Method Group Backward
 EnumerateGroupBackwardKeys=
 # Time limit in milliseconds for triggering modifier key shortcuts
-ModifierOnlyKeyTimeout=250
+# ModifierOnlyKeyTimeout=250
 
 [Hotkey/TriggerKeys]
 0=Control+space
-1=Hangul
 
-[Hotkey/ActivateKeys]
-0=Hangul_Hanja
+# [Hotkey/ActivateKeys]
+# 0=Hangul_Hanja
 
-[Hotkey/DeactivateKeys]
-0=Hangul_Romaja
+# [Hotkey/DeactivateKeys]
+# 0=Hangul_Romaja
 
 [Hotkey/PrevPage]
-0=Up
+0=Control+K
 
 [Hotkey/NextPage]
-0=Down
+0=Control+J
 
 [Hotkey/PrevCandidate]
-0=Shift+Tab
+0=Control+H
 
 [Hotkey/NextCandidate]
-0=Tab
+0=Control+L
 
-[Hotkey/TogglePreedit]
-0=Control+Alt+P
+# [Hotkey/TogglePreedit]
+# 0=Control+Alt+P
 
 [Behavior]
 # Activate input method by default
-ActiveByDefault=False
+# ActiveByDefault=False
 # Reset state on Focus In
-resetStateWhenFocusIn=No
+# resetStateWhenFocusIn=No
 # Share Input State
-ShareInputState=No
+ShareInputState=All
 # Show preedit in application
-PreeditEnabledByDefault=True
+# PreeditEnabledByDefault=True
 # Show Input Method Information when switch input method
-ShowInputMethodInformation=True
+# ShowInputMethodInformation=True
 # Show Input Method Information when changing focus
-showInputMethodInformationWhenFocusIn=False
+# showInputMethodInformationWhenFocusIn=False
 # Show compact input method information
-CompactInputMethodInformation=True
+# CompactInputMethodInformation=True
 # Show first input method information
-ShowFirstInputMethodInformation=True
+# ShowFirstInputMethodInformation=True
 # Default Candidates per page
 DefaultPageSize=10
 # Override XKB Option
-OverrideXkbOption=False
+# OverrideXkbOption=False
 # Custom XKB Option
-CustomXkbOption=
+# CustomXkbOption=
 # Force Enabled Addons
-EnabledAddons=
+# EnabledAddons=
 # Force Disabled Addons
-DisabledAddons=
+# DisabledAddons=
 # Preload input method to be used by default
-PreloadInputMethod=True
+# PreloadInputMethod=True
 # Allow input method in the password field
-AllowInputMethodForPassword=False
+# AllowInputMethodForPassword=False
 # Show preedit text when typing password
-ShowPreeditForPassword=False
+# ShowPreeditForPassword=False
 # Interval of saving user data in minutes
-AutoSavePeriod=30
+# AutoSavePeriod=30
 
diff --git a/dot-config/fcitx5/profile b/dot-config/fcitx5/profile
index 5163a512..061d916b 100644
--- a/dot-config/fcitx5/profile
+++ b/dot-config/fcitx5/profile
@@ -2,13 +2,13 @@
 # Group Name
 Name=Default
 # Layout
-Default Layout=us
+Default Layout=us-altgr-intl
 # Default Input Method
 DefaultIM=rime
 
 [Groups/0/Items/0]
 # Name
-Name=keyboard-us
+Name=keyboard-us-altgr-intl
 # Layout
 # Layout=
 
diff --git a/dot-local/share/fcitx5/rime/jyut6ping3.custom.yaml b/dot-local/share/fcitx5/rime/jyut6ping3.custom.yaml
index 869dba8e..0dbb6165 100644
--- a/dot-local/share/fcitx5/rime/jyut6ping3.custom.yaml
+++ b/dot-local/share/fcitx5/rime/jyut6ping3.custom.yaml
@@ -12,3 +12,8 @@ patch:
     - derive/k$/t/
     - derive/m$/ng/
     - derive/p$/k/
+  "key_binder/bindings/+":
+    - { when: has_menu, accept: Control+h, send: Up }
+    - { when: has_menu, accept: Control+l, send: Down }
+    - { when: has_menu, accept: Control+k, send: Page_Up }
+    - { when: has_menu, accept: Control+j, send: Page_Down }