From d483163cdacabfab38dc7d566f3356179300e9f5 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Tue, 19 Oct 2021 13:06:37 +0700
Subject: [PATCH] system: move GUI-related env vars to /etc/environment

---
 home/.bashrc-bloated              |  9 ---------
 home/.config/fish/conf.d/env.fish |  9 ---------
 home/.config/zsh/.zshenv          |  9 ---------
 home/.ssh/environment             |  1 -
 system/etc/environment            | 19 +++++++++++++++++++
 5 files changed, 19 insertions(+), 28 deletions(-)
 delete mode 100644 home/.ssh/environment
 create mode 100644 system/etc/environment

diff --git a/home/.bashrc-bloated b/home/.bashrc-bloated
index 28d2525..719a0b2 100644
--- a/home/.bashrc-bloated
+++ b/home/.bashrc-bloated
@@ -48,8 +48,6 @@ export SVDIR=$HOME/.local/share/service
 export _JAVA_AWT_WM_NONREPARENTING=1
 export GPG_TTY="$(tty)"
 export GOPROXY=direct
-# pfetch
-export PF_INFO="ascii title kernel wm shell uptime pkgs memory"
 # fzf
 export FZF_DEFAULT_OPTS="--multi --layout=reverse --inline-info
  --bind alt-j:preview-down,alt-k:preview-up
@@ -65,13 +63,6 @@ export FZF_CTRL_T_COMMAND="fd --follow --hidden --exclude .git"
 export FZF_ALT_C_OPTS="--preview 'exa -1a --sort=type --color always --icons {} 2>/dev/null'"
 export FZF_ALT_C_COMMAND="fd --type d --follow --hidden --exclude .git"
 export FZF_TMUX=1
-# ibus
-export GTK_IM_MODULE=ibus
-export XMODIFIERS=@im=ibus
-export QT_IM_MODULE=ibus
-# qt5ct
-export QT_QPA_PLATFORMTHEME=qt5ct
-export QT_PLATFORM_PLUGIN=qt5ct
 # .NET
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 # zoxide
diff --git a/home/.config/fish/conf.d/env.fish b/home/.config/fish/conf.d/env.fish
index 719ee7f..42b41a6 100644
--- a/home/.config/fish/conf.d/env.fish
+++ b/home/.config/fish/conf.d/env.fish
@@ -59,8 +59,6 @@ set -gx SVDIR $HOME/.local/share/service
 set -gx _JAVA_AWT_WM_NONREPARENTING 1
 set -gx GPG_TTY (tty)
 set -gx GOPROXY direct
-# pfetch
-set -gx PF_INFO "ascii title kernel wm shell uptime pkgs memory"
 # fzf
 set -gx FZF_DEFAULT_OPTS "--multi --layout=reverse --inline-info
  --bind alt-j:preview-down,alt-k:preview-up
@@ -76,13 +74,6 @@ set -gx FZF_CTRL_T_COMMAND "fd . \$dir --follow --hidden --exclude .git"
 set -gx FZF_ALT_C_OPTS "--preview 'exa -1a --sort=type --color always --icons {} 2>/dev/null'"
 set -gx FZF_ALT_C_COMMAND "fd --type d --follow --hidden --exclude .git"
 set -gx FZF_TMUX 1
-# ibus
-set -gx GTK_IM_MODULE ibus
-set -gx XMODIFIERS @im=ibus
-set -gx QT_IM_MODULE ibus
-# qt5ct
-set -gx QT_QPA_PLATFORMTHEME qt5ct
-set -gx QT_PLATFORM_PLUGIN qt5ct
 # .NET
 set -gx DOTNET_CLI_TELEMETRY_OPTOUT 1
 # nodenv
diff --git a/home/.config/zsh/.zshenv b/home/.config/zsh/.zshenv
index 3514290..f914b63 100644
--- a/home/.config/zsh/.zshenv
+++ b/home/.config/zsh/.zshenv
@@ -46,8 +46,6 @@ export SVDIR=$XDG_DATA_HOME/service
 export _JAVA_AWT_WM_NONREPARENTING=1
 export GPG_TTY="$(tty)"
 export GOPROXY=direct
-# pfetch
-export PF_INFO="ascii title kernel wm shell uptime pkgs memory"
 # fzf
 export FZF_DEFAULT_OPTS="--multi --layout=reverse --inline-info
  --bind alt-j:preview-down,alt-k:preview-up
@@ -63,13 +61,6 @@ export FZF_CTRL_T_COMMAND="fd --follow --hidden --exclude .git"
 export FZF_ALT_C_OPTS="--preview 'exa -1a --sort=type --color always --icons {} 2>/dev/null'"
 export FZF_ALT_C_COMMAND="fd --type d --follow --hidden --exclude .git"
 export FZF_TMUX=1
-# ibus
-export GTK_IM_MODULE=ibus
-export XMODIFIERS=@im=ibus
-export QT_IM_MODULE=ibus
-# qt5ct
-export QT_QPA_PLATFORMTHEME=qt5ct
-export QT_PLATFORM_PLUGIN=qt5ct
 # .NET
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 # nodenv
diff --git a/home/.ssh/environment b/home/.ssh/environment
deleted file mode 100644
index c58352a..0000000
--- a/home/.ssh/environment
+++ /dev/null
@@ -1 +0,0 @@
-TERM=xterm-256color
diff --git a/system/etc/environment b/system/etc/environment
new file mode 100644
index 0000000..9f9d895
--- /dev/null
+++ b/system/etc/environment
@@ -0,0 +1,19 @@
+########
+# ibus #
+########
+# GTK_IM_MODULE=ibus
+# XMODIFIERS=@im=ibus
+# QT_IM_MODULE=ibus
+
+##########
+# fcitx5 #
+##########
+GTK_IM_MODULE=fcitx
+XMODIFIERS=@im=fcitx
+QT_IM_MODULE=fcitx
+
+#########
+# qt5ct #
+#########
+QT_QPA_PLATFORMTHEME=qt5ct
+QT_PLATFORM_PLUGIN=qt5ct