From f6a5bad6ad199521e2f87cac6579a21e87d7239e Mon Sep 17 00:00:00 2001
From: Marco Thomas <rb.ma.tho@gmail.com>
Date: Sun, 9 Oct 2022 11:39:00 +0200
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E5=85=A5=E5=8A=9B?=
 =?UTF-8?q?=E3=82=92=E7=9B=B4=E3=81=97=E3=81=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 33 +++++++++++++------
 .../.config/environment.d/envvars.conf        |  8 ++---
 files/zsh/.zshrc                              | 13 ++++----
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 1aa9e0b..5f66171 100644
--- a/README.md
+++ b/README.md
@@ -6,34 +6,47 @@ Files can be `stow`'ed and un'`stow`'ed with `stow.sh`.
 It will link all dotfiles to their correct place.
 
 ## fonts
-Fonts are provided in `fonts/`
+Fonts are provided in `fonts/`.
 SFMono also provides icons.
 
 ## ssh-agent(1)
 Move `ssh-agent.service` to `~/.config/systemd/user/ssh-agent.service`
 and start it appropriately.
+Only used in sway.
 
 ## deps
 ### for sway
 + `waybar`
 + `SwayNotificationCenter`
-+ `wob` (progress bar)
-+ `wofi` (launcher)
++ `wob` (progress bar; audio, brightness)
++ `wofi` (program launcher) 
 + `slurp`, `grim`, `swappy` (screenshot)
-+ `swaylock-effects`
-+ [`wmrctl`](https://git.sr.ht/~brocellous/wlrctl) (window switcher)
++ `swaylock-effects` (fancy locker)
++ [`wmrctl`](https://git.sr.ht/~brocellous/wlrctl) (advanced window switcher)
 
-### other (used in scripts)
-+ `fzf` (used in many places)
+### other
++ `fzf`
 + `ripgrep` (`nvim` needs this)
-+ `ripgrep-all` (used in grep scripts)
-+ `fd` (rust find; used in scripts)
++ `ripgrep-all` (used in `wofi`; `sway`)
++ `fd` (rust find; used in `sway`)
 + all `fcitx5` stuff (data, gtk, qt, mozc)
 
-### theming stuff
+### theming stuff (sway)
 + main bg: #323232
 + accent: #93b259
 + icons: `Flat-Remix-Green-Light-darkPanel` (from `flat-remix-icon-theme`)
 + theme: `Flat-Remix-GTK-Green-Light-solid` with adjusted accent
   + or `/usr/share/themes/Flat-Remix-Marc`
 
+## 日本語入力
+With `fcitx5` under `sway` use:
++ `GTK_IM_MODULE=fcitx5`
++ `QT_IM_MODULE=fcitx5`
++ `SDL_IM_MODULE=fcitx5`
++ `GLFW_IM_MODULE=ibus`
++ `XMODIFIERS="@im=fcitx5"`
+
+With `ibus-anthy` under GNOME use:
++ `GTK_IM_MODULE=ibus`
++ `QT_IM_MODULE=ibus`
++ `XMODIFIERS=@im=ibus`
diff --git a/files/environment/.config/environment.d/envvars.conf b/files/environment/.config/environment.d/envvars.conf
index 58e12a8..aa350cb 100644
--- a/files/environment/.config/environment.d/envvars.conf
+++ b/files/environment/.config/environment.d/envvars.conf
@@ -3,8 +3,6 @@ EDITOR=vim
 VISUAL=vim
 _JAVA_AWT_WM_NONREPARENTING=1
 SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/ssh-agent.socket"
-GTK_IM_MODULE=fcitx5
-QT_IM_MODULE=fcitx5
-SDL_IM_MODULE=fcitx5
-GLFW_IM_MODULE=ibus
-XMODIFIERS="@im=fcitx5"
+GTK_IM_MODULE=ibus
+QT_IM_MODULE=ibus
+XMODIFIERS=@im=ibus
diff --git a/files/zsh/.zshrc b/files/zsh/.zshrc
index 32f286b..e8aace7 100644
--- a/files/zsh/.zshrc
+++ b/files/zsh/.zshrc
@@ -14,8 +14,8 @@ DIR="%{$fg[blue]%}%~"
 GIT="%{$fg[red]%}\$vcs_info_msg_0_"
 HOSTN="%{$fg[yellow]%}%m "
 
-BREAK=''
-[ $(tput cols) -lt 60 ] && BREAK=$'\n'
+# BREAK=''
+# [ $(tput cols) -lt 60 ] && BREAK=$'\n'
 
 export PROMPT="${HOSTN}${DIR}${GIT} ${BREAK}${ICON}%{$reset_color%} "
 zstyle ':vcs_info:git:*' formats ' (%b )'
@@ -111,10 +111,6 @@ alias zg='ls'
 alias ädrbes='chown'
 alias erstelle='touch'
 
-if [ -f ~/.zshrc_local ]; then
-    source ~/.zshrc_local
-fi
-
 # ============================== Completion
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
@@ -302,3 +298,8 @@ fancy-ctrl-z () {
 }
 zle -N fancy-ctrl-z
 bindkey '^Z' fancy-ctrl-z
+
+# ============================== Source other definitions
+if [ -f ~/.zshrc_local ]; then
+    source ~/.zshrc_local
+fi