From edf5479584af371241c03ec204d883b25b38c653 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Wed, 15 Jun 2022 21:47:42 +0200
Subject: [PATCH] Add Japanese input method

---
 apps/fcitx5/config/fcitx5/conf/classicui.conf |   2 +
 apps/fcitx5/config/fcitx5/conf/keyboard.conf  |  23 ++++
 .../config/fcitx5/conf/notifications.conf     |   3 +
 apps/fcitx5/config/fcitx5/config              |  63 +++++++++++
 apps/fcitx5/config/fcitx5/profile             |  23 ++++
 .../share/fcitx5/themes/Nord-Dark/arrow.png   | Bin 0 -> 337 bytes
 .../share/fcitx5/themes/Nord-Dark/radio.png   | Bin 0 -> 272 bytes
 .../share/fcitx5/themes/Nord-Dark/theme.conf  |  98 ++++++++++++++++++
 apps/packages.txt                             |   7 ++
 apps/sxhkd/config/sxhkd/sxhkdrc               |   6 --
 cli/profile/config/profile                    |   6 ++
 dwm/dwm                                       |   2 +-
 dwm/dwmblocks/blocks.h                        |   6 +-
 dwm/dwmblocks/status-bar/language.sh          |  13 +++
 dwm/dwmstartup/startdwm                       |   6 +-
 15 files changed, 243 insertions(+), 15 deletions(-)
 create mode 100644 apps/fcitx5/config/fcitx5/conf/classicui.conf
 create mode 100644 apps/fcitx5/config/fcitx5/conf/keyboard.conf
 create mode 100644 apps/fcitx5/config/fcitx5/conf/notifications.conf
 create mode 100644 apps/fcitx5/config/fcitx5/config
 create mode 100644 apps/fcitx5/config/fcitx5/profile
 create mode 100644 apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/arrow.png
 create mode 100644 apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/radio.png
 create mode 100644 apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/theme.conf
 create mode 100755 dwm/dwmblocks/status-bar/language.sh

diff --git a/apps/fcitx5/config/fcitx5/conf/classicui.conf b/apps/fcitx5/config/fcitx5/conf/classicui.conf
new file mode 100644
index 0000000..c7be39d
--- /dev/null
+++ b/apps/fcitx5/config/fcitx5/conf/classicui.conf
@@ -0,0 +1,2 @@
+Theme=Nord-Dark
+
diff --git a/apps/fcitx5/config/fcitx5/conf/keyboard.conf b/apps/fcitx5/config/fcitx5/conf/keyboard.conf
new file mode 100644
index 0000000..280d064
--- /dev/null
+++ b/apps/fcitx5/config/fcitx5/conf/keyboard.conf
@@ -0,0 +1,23 @@
+# Page size
+PageSize=5
+# Enable emoji in hint
+EnableEmoji=True
+# Enable emoji in quickphrase
+EnableQuickPhraseEmoji=True
+# Choose key modifier
+Choose Modifier=Alt
+# Enable hint by default
+EnableHintByDefault=False
+# Use new compose behavior
+UseNewComposeBehavior=True
+# Type special characters with long press
+EnableLongPress=False
+# Applications disabled for long press
+LongPressBlocklist=
+
+[PrevCandidate]
+0=Shift+Tab
+
+[NextCandidate]
+0=Tab
+
diff --git a/apps/fcitx5/config/fcitx5/conf/notifications.conf b/apps/fcitx5/config/fcitx5/conf/notifications.conf
new file mode 100644
index 0000000..6e7d1b9
--- /dev/null
+++ b/apps/fcitx5/config/fcitx5/conf/notifications.conf
@@ -0,0 +1,3 @@
+# Hidden Notifications
+HiddenNotifications=
+
diff --git a/apps/fcitx5/config/fcitx5/config b/apps/fcitx5/config/fcitx5/config
new file mode 100644
index 0000000..c773b5b
--- /dev/null
+++ b/apps/fcitx5/config/fcitx5/config
@@ -0,0 +1,63 @@
+[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=
+# Default Previous page
+PrevPage=
+# Default Next page
+NextPage=
+# Toggle embedded preedit
+TogglePreedit=
+
+[Hotkey/TriggerKeys]
+0=Hangul
+
+[Hotkey/PrevCandidate]
+0=Shift+Tab
+
+[Hotkey/NextCandidate]
+0=Tab
+
+[Behavior]
+# Active By Default
+ActiveByDefault=False
+# Share Input State
+ShareInputState=All
+# 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/apps/fcitx5/config/fcitx5/profile b/apps/fcitx5/config/fcitx5/profile
new file mode 100644
index 0000000..5dc8c41
--- /dev/null
+++ b/apps/fcitx5/config/fcitx5/profile
@@ -0,0 +1,23 @@
+[Groups/0]
+# Group Name
+Name=Default
+# 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=Default
+
diff --git a/apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/arrow.png b/apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..85a5a97a983a08dacb5cc93957c356c6f21d4baf
GIT binary patch
literal 337
zcmeAS@N?(olHy`uVBq!ia0vp^AhrMp8<5nmf9C+CSc;uILpXq-h9ji|$mcBZh%9Dc
z;5!1sj8nDwq=ABxC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6d{^K@|x
z(U>^(;>Ii{M*+46^?l5%O@4Vy+vpweiG|V9AUEXF^6Mf8!%s**>CG#9{va)I(VZJ}
z9!|N-{Qp;S*}upcl7*t%-n?e2)pRY_$<n#CVf}N>=?CA4AK+wY%y{e~esblyRp~la
zIqK5YweJsK&Xx(Q{V~(^|G$kbrMu?v3yaytY?%CkkzvY#ewS~|2@DJdHEAa=&K0<5
zx9xdw`T5hAzfbR+lP>9ex7pn9i|(a>_`HBG+{FUN7>XF!HYb_X{OAfZ-+bohuia}7
eWs7XFWKOlaYBBwD@>QVE7(8A5T-G@yGywpry@h4~

literal 0
HcmV?d00001

diff --git a/apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/radio.png b/apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/radio.png
new file mode 100644
index 0000000000000000000000000000000000000000..68b0ff2104fc86a05bbd4c097ac1cfdcf5660f56
GIT binary patch
literal 272
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#X$M%Ak65bF}ngNC|Tkf
zQ4*Y=R#Ki=l*&+EUaps!mtCBkSdglhUz9%kosASw(Ogd##}JRsw-XO?H5&-Hq)T0p
z*V>!rneS!4UH5IGqWeMlppM(!m*iSFs<Q7H?w-uP*<oS8gKMs#xpRxt89X$<Dz^Mi
zY?63<`V5PMsXedC)$03CHZ8x?v}#-0vwA!BhFfRW86NxFv~yZjYKZUUlAF3Wyu&60
zz4GkSUfh^6{dB(Vr^9EM_J#H`+*2yDb}{gtwX}HB+zy-VY22;#&zTQ(n=fDeLS!S*
Op$wj`elF{r5}E*}A8D@u

literal 0
HcmV?d00001

diff --git a/apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/theme.conf b/apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/theme.conf
new file mode 100644
index 0000000..71289dd
--- /dev/null
+++ b/apps/fcitx5/local/share/fcitx5/themes/Nord-Dark/theme.conf
@@ -0,0 +1,98 @@
+# vim: ft=dosini
+[Metadata]
+Name=Nord-Dark
+Version=0.1
+Author=tonyfettes
+Description=Nord Color Theme (Dark)
+ScaleWithDPI=True
+
+[InputPanel]
+# 字体
+Font=Sans 13
+# 非选中候选字颜色
+NormalColor=#81a1c1
+# 选中候选字颜色
+HighlightCandidateColor=#88c0d0
+# 高亮前景颜色(输入字符颜色)
+HighlightColor=#88c0d0
+# 输入字符背景颜色
+HighlightBackgroundColor=#434c5e
+# 
+Spacing=3
+
+[InputPanel/TextMargin]
+# 候选字对左边距
+Left=10
+# 候选字对右边距
+Right=10
+# 候选字向上边距
+Top=6
+# 候选字向下边距
+Bottom=6
+
+[InputPanel/Background]
+Color=#434c5e
+
+[InputPanel/Background/Margin]
+Left=2
+Right=2
+Top=2
+Bottom=2
+
+[InputPanel/Highlight]
+Color=#4c566a
+
+[InputPanel/Highlight/Margin]
+# 高亮区域左边距
+Left=10
+# 高亮区域右边距
+Right=10
+# 高亮区域上边距
+Top=7
+# 高亮区域下边距
+Bottom=7
+
+[Menu]
+Font=Sans 10
+NormalColor=#eceff4
+#HighlightColor=#4c566a
+Spacing=3
+
+[Menu/Background]
+Color=#434c5e
+
+[Menu/Background/Margin]
+Left=2
+Right=2
+Top=2
+Bottom=2
+
+[Menu/ContentMargin]
+Left=2
+Right=2
+Top=2
+Bottom=2
+
+[Menu/Highlight]
+Color=#4c566a
+
+[Menu/Highlight/Margin]
+Left=10
+Right=10
+Top=5
+Bottom=5
+
+[Menu/Separator]
+Color=#2e3440
+
+[Menu/CheckBox]
+Image=radio.png
+
+[Menu/SubMenu]
+Image=arrow.png
+
+[Menu/TextMargin]
+Left=5
+Right=5
+Top=5
+Bottom=5
diff --git a/apps/packages.txt b/apps/packages.txt
index 1456193..9a58dee 100644
--- a/apps/packages.txt
+++ b/apps/packages.txt
@@ -40,6 +40,13 @@ noto-fonts
 noto-fonts-cjk
 noto-fonts-emoji
 
+# Japanese
+fcitx5
+fcitx5-qt
+fcitx5-gtk
+fcitx5-lua
+fcitx5-mozc
+
 # Apps
 feh
 rofi
diff --git a/apps/sxhkd/config/sxhkd/sxhkdrc b/apps/sxhkd/config/sxhkd/sxhkdrc
index b69a95d..e4761a4 100644
--- a/apps/sxhkd/config/sxhkd/sxhkdrc
+++ b/apps/sxhkd/config/sxhkd/sxhkdrc
@@ -10,9 +10,6 @@ super + r
 super + e
 	$TERMINAL
 
-super + x
-	rofi -modi todo:~/.config/rofi/todo.sh -show todo
-
 super + v
 	CM_LAUNCHER=rofi clipmenu
 
@@ -33,6 +30,3 @@ XF86AudioStop
 
 Print
 	maim -s | xclip -selection clipboard -t image/png
-
-super + z
-	dunstctl close-all
diff --git a/cli/profile/config/profile b/cli/profile/config/profile
index 08fa213..6199e04 100644
--- a/cli/profile/config/profile
+++ b/cli/profile/config/profile
@@ -9,6 +9,12 @@ export XDG_DATA_DIRS="$XDG_DATA_HOME:/usr/share:/usr/local/share"
 export DOTFILES=$(realpath $(dirname $(realpath $XDG_CONFIG_HOME/profile))/../../..)
 export PATH=$HOME/.local/bin:$PATH
 
+# IBUS (input processor (for japanese))
+export GTK_IM_MODULE=fcitx
+export QT_IM_MODULE=fcitx
+export XMODIFIERS=@im=fcitx
+export GLFW_IM_MODULE=ibus
+
 # Load dotfiles from XDG directories instead of the HOME.
 export ZDOTDIR=$XDG_CONFIG_HOME/zsh
 export HISTFILE="$XDG_STATE_HOME"/zsh/history
diff --git a/dwm/dwm b/dwm/dwm
index ab7ebf7..c32d53a 160000
--- a/dwm/dwm
+++ b/dwm/dwm
@@ -1 +1 @@
-Subproject commit ab7ebf787f0ff28c65c4979d305d343082ec5abb
+Subproject commit c32d53ad767e5baa45a1c24d013a1d2e1f9522a6
diff --git a/dwm/dwmblocks/blocks.h b/dwm/dwmblocks/blocks.h
index 53ef66b..0e9f45e 100644
--- a/dwm/dwmblocks/blocks.h
+++ b/dwm/dwmblocks/blocks.h
@@ -7,19 +7,17 @@
 
 static Block blocks[] = {
 /*    Icon  Command                      Update Interval  Update Signal */
-//	{ "",   PATH("mail.sh"),             120,             23 },
-//	{ "",   PATH("mconnect"),            120,             20 },
-//	{ "",   PATH("media.sh"),            240,             21 },
 	{ "",   PATH("dunst.sh"),            120,             20 },
 	{ "",   PATH("redshift.sh"),         120,             19 },
 	{ "",   PATH("cpu.sh"),              120,             18 },
 	{ "",   PATH("memory.sh"),           120,             17 },
+	{ "",   PATH("language.sh"),         1,               21 },
 	{ "",   PATH("volume.sh"),           5,               16 },
 	{ "",   PATH("bluetooth.sh"),        120,             15 },
 	{ "",   PATH("network.sh"),          20,              14 },
 	{ "",   PATH("battery.sh"),          60,              13 },
 	{ "",   PATH("date.sh"),             240,             12 },
-	{ "",   PATH("time.sh"),             30,              11 },
+	{ "",   PATH("time.sh"),             10,              11 },
 };
 
 //sets delimeter between status commands. NULL character ('\0') means no delimeter.
diff --git a/dwm/dwmblocks/status-bar/language.sh b/dwm/dwmblocks/status-bar/language.sh
new file mode 100755
index 0000000..156e414
--- /dev/null
+++ b/dwm/dwmblocks/status-bar/language.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+case $BUTTON in
+	1) fcitx5-remote -t;;
+esac
+
+echo -n "^C6^ ^d^"
+
+if [[ $(fcitx5-remote) = "1" ]]; then
+	echo "en"
+else
+	echo "jp"
+fi
diff --git a/dwm/dwmstartup/startdwm b/dwm/dwmstartup/startdwm
index b2e0b39..b58c6d9 100755
--- a/dwm/dwmstartup/startdwm
+++ b/dwm/dwmstartup/startdwm
@@ -33,14 +33,12 @@ dwmblocks &
 sxhkd &
 clipmenud &
 dunstctl set-paused true
-redshift -l $(curl -s "https://location.services.mozilla.com/v1/geolocate?key=geoclue" | awk 'OFS=":" {print $3,$5}' | tr -d ',}') &
-
-source $DOTFILES/rofi/todo.zsh
-{ todogit pull || true } &
+fcitx5 -d
 
 # I start the session via LightDM with auto-logging and here we show the lockscreen and wait for the password to unlock both the session and the gnome-keyring.
 lock -n
 discord &
+redshift -l $(curl -s "https://location.services.mozilla.com/v1/geolocate?key=geoclue" | awk 'OFS=":" {print $3,$5}' | tr -d ',}') &
 
 while true; do
 	source ~/wm # A file to define the window manager to use. I use this to easilly switch between dwn and xmonad while the config is not done