diff --git a/modules/fcitx5-mozc/classicui.conf b/modules/fcitx5-mozc/classicui.conf deleted file mode 100644 index d94d2eee..00000000 --- a/modules/fcitx5-mozc/classicui.conf +++ /dev/null @@ -1,24 +0,0 @@ -# Vertical Candidate List -Vertical Candidate List=False -# Use Per Screen DPI -PerScreenDPI=True -# Use mouse wheel to go to prev or next page -WheelForPaging=True -# Font -Font="Noto Sans CJK JP 11" -# Menu Font -MenuFont="Noto Sans CJK JP 11" -# Tray Font -TrayFont="Noto Sans CJK JP Medium 11" -# Tray Label Outline Color -TrayOutlineColor=#49483e -# Tray Label Text Color -TrayTextColor=#f8f8f2 -# Prefer Text Icon -PreferTextIcon=True -# Show Layout Name In Icon -ShowLayoutNameInIcon=True -# Use input method language to display text -UseInputMethodLangaugeToDisplayText=True -# Theme -Theme=default diff --git a/modules/fcitx5-mozc/clipboard.conf b/modules/fcitx5-mozc/clipboard.conf deleted file mode 100644 index 0a34d081..00000000 --- a/modules/fcitx5-mozc/clipboard.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Trigger Key -TriggerKey= -# Paste Primary -PastePrimaryKey= -# Number of entries -Number of entries=5 diff --git a/modules/fcitx5-mozc/config b/modules/fcitx5-mozc/config deleted file mode 100644 index 4e50948e..00000000 --- a/modules/fcitx5-mozc/config +++ /dev/null @@ -1,65 +0,0 @@ -[Hotkey] -# Enumerate when press trigger key repeatedly -EnumerateWithTriggerKeys=True -# Temporally switch between first and current Input Method -AltTriggerKeys= -# Enumerate Input Method Forward -EnumerateForwardKeys= -# Enumerate Input Method Backward -EnumerateBackwardKeys= -# Skip first input method while enumerating -EnumerateSkipFirst=False -# Enumerate Input Method Group Forward -EnumerateGroupForwardKeys= -# Enumerate Input Method Group Backward -EnumerateGroupBackwardKeys= -# Activate Input Method -ActivateKeys= -# Deactivate Input Method -DeactivateKeys= - -[Hotkey/TriggerKeys] -0=Super+space - -[Hotkey/PrevPage] -0=Up - -[Hotkey/NextPage] -0=Down - -[Hotkey/PrevCandidate] -0=Shift+Tab - -[Hotkey/NextCandidate] -0=Tab - -[Hotkey/TogglePreedit] -0=Control+Alt+P - -[Behavior] -# Active By Default -ActiveByDefault=False -# Share Input State -ShareInputState=No -# Show preedit in application -PreeditEnabledByDefault=True -# Show Input Method Information when switch input method -ShowInputMethodInformation=True -# Show Input Method Information when changing focus -showInputMethodInformationWhenFocusIn=False -# Show compact input method information -CompactInputMethodInformation=True -# Show first input method information -ShowFirstInputMethodInformation=True -# Default page size -DefaultPageSize=5 -# Override Xkb Option -OverrideXkbOption=False -# Custom Xkb Option -CustomXkbOption= -# Force Enabled Addons -EnabledAddons= -# Force Disabled Addons -DisabledAddons= -# Preload input method to be used by default -PreloadInputMethod=True diff --git a/modules/fcitx5-mozc/default.nix b/modules/fcitx5-mozc/default.nix index 4f708987..15620ff3 100644 --- a/modules/fcitx5-mozc/default.nix +++ b/modules/fcitx5-mozc/default.nix @@ -7,32 +7,181 @@ xdg.configFile = { "mozc/ibus_config.textproto" = { force = true; - source = ./ibus_config.textproto; + text = /* config */ '' + engines { + name : "mozc-jp" + longname : "Mozc" + layout : "default" + layout_variant : "" + layout_option : "" + rank : 80 + } + active_on_launch: True + ''; }; + "fcitx5/config" = { force = true; - source = ./config; + text = /* ini */ '' + [Hotkey] + # Enumerate when press trigger key repeatedly + EnumerateWithTriggerKeys=True + # Temporally switch between first and current Input Method + AltTriggerKeys= + # Enumerate Input Method Forward + EnumerateForwardKeys= + # Enumerate Input Method Backward + EnumerateBackwardKeys= + # Skip first input method while enumerating + EnumerateSkipFirst=False + # Enumerate Input Method Group Forward + EnumerateGroupForwardKeys= + # Enumerate Input Method Group Backward + EnumerateGroupBackwardKeys= + # Activate Input Method + ActivateKeys= + # Deactivate Input Method + DeactivateKeys= + + [Hotkey/TriggerKeys] + 0=Super+space + + [Hotkey/PrevPage] + 0=Up + + [Hotkey/NextPage] + 0=Down + + [Hotkey/PrevCandidate] + 0=Shift+Tab + + [Hotkey/NextCandidate] + 0=Tab + + [Hotkey/TogglePreedit] + 0=Control+Alt+P + + [Behavior] + # Active By Default + ActiveByDefault=False + # Share Input State + ShareInputState=No + # Show preedit in application + PreeditEnabledByDefault=True + # Show Input Method Information when switch input method + ShowInputMethodInformation=True + # Show Input Method Information when changing focus + showInputMethodInformationWhenFocusIn=False + # Show compact input method information + CompactInputMethodInformation=True + # Show first input method information + ShowFirstInputMethodInformation=True + # Default page size + DefaultPageSize=5 + # Override Xkb Option + OverrideXkbOption=False + # Custom Xkb Option + CustomXkbOption= + # Force Enabled Addons + EnabledAddons= + # Force Disabled Addons + DisabledAddons= + # Preload input method to be used by default + PreloadInputMethod=True + ''; }; + "fcitx5/profile" = { force = true; - source = ./profile; + text = /* ini */ '' + [Groups/0] + # Group Name + Name="Group 1" + # Layout + Default Layout=us + # Default Input Method + DefaultIM=mozc + + [Groups/0/Items/0] + # Name + Name=keyboard-us + # Layout + Layout= + + [Groups/0/Items/1] + # Name + Name=mozc + # Layout + Layout= + + [GroupOrder] + 0="Group 1" + ''; }; + "fcitx5/conf/classicui.conf" = { force = true; - source = ./classicui.conf; + text = /* ini */ '' + # Vertical Candidate List + Vertical Candidate List=False + # Use Per Screen DPI + PerScreenDPI=True + # Use mouse wheel to go to prev or next page + WheelForPaging=True + # Font + Font="Noto Sans CJK JP 11" + # Menu Font + MenuFont="Noto Sans CJK JP 11" + # Tray Font + TrayFont="Noto Sans CJK JP Medium 11" + # Tray Label Outline Color + TrayOutlineColor=#49483e + # Tray Label Text Color + TrayTextColor=#f8f8f2 + # Prefer Text Icon + PreferTextIcon=True + # Show Layout Name In Icon + ShowLayoutNameInIcon=True + # Use input method language to display text + UseInputMethodLangaugeToDisplayText=True + # Theme + Theme=default + ''; }; + "fcitx5/conf/clipboard.conf" = { force = true; - source = ./clipboard.conf; + text = /* ini */ '' + # Trigger Key + TriggerKey= + # Paste Primary + PastePrimaryKey= + # Number of entries + Number of entries=5 + ''; }; + "fcitx5/conf/mozc.conf" = { force = true; - source = ./mozc.conf; + text = /* ini */ '' + # Initial Mode + InitialMode=Hiragana + # Vertical candidate list + Vertical=True + # Expand Usage (Requires vertical candidate list) + ExpandMode="On Focus" + # Fix embedded preedit cursor at the beginning of the preedit + PreeditCursorPositionAtBeginning=False + # Hotkey to expand usage + ExpandKey=Control+Alt+H + ''; }; + "fcitx5/conf/notifications.conf" = { force = true; text = "HiddenNotifications="; }; + "fcitx5/conf/unicode.conf" = { force = true; text = "TriggerKey="; diff --git a/modules/fcitx5-mozc/ibus_config.textproto b/modules/fcitx5-mozc/ibus_config.textproto deleted file mode 100644 index 61c58d08..00000000 --- a/modules/fcitx5-mozc/ibus_config.textproto +++ /dev/null @@ -1,9 +0,0 @@ -engines { - name : "mozc-jp" - longname : "Mozc" - layout : "default" - layout_variant : "" - layout_option : "" - rank : 80 -} -active_on_launch: True diff --git a/modules/fcitx5-mozc/mozc.conf b/modules/fcitx5-mozc/mozc.conf deleted file mode 100644 index d7f2fa11..00000000 --- a/modules/fcitx5-mozc/mozc.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Initial Mode -InitialMode=Hiragana -# Vertical candidate list -Vertical=True -# Expand Usage (Requires vertical candidate list) -ExpandMode="On Focus" -# Fix embedded preedit cursor at the beginning of the preedit -PreeditCursorPositionAtBeginning=False -# Hotkey to expand usage -ExpandKey=Control+Alt+H diff --git a/modules/fcitx5-mozc/profile b/modules/fcitx5-mozc/profile deleted file mode 100644 index 6272458d..00000000 --- a/modules/fcitx5-mozc/profile +++ /dev/null @@ -1,22 +0,0 @@ -[Groups/0] -# Group Name -Name="Group 1" -# Layout -Default Layout=us -# Default Input Method -DefaultIM=mozc - -[Groups/0/Items/0] -# Name -Name=keyboard-us -# Layout -Layout= - -[Groups/0/Items/1] -# Name -Name=mozc -# Layout -Layout= - -[GroupOrder] -0="Group 1"