commit 48a8e28b662873541c63a949c57969f2bf89ccdd
parent bde43d1e4aeaa1997df1563ae1fee0d0e06bfc9f
Author: Chris Bracken <chris@bracken.jp>
Date: Wed, 6 May 2020 10:29:29 -0700
Move env var definitions to .zshenv
$ZDOTDIR/.zshenv is read on zsh startup whenever rcs (read rc files) is
true, which is the case by default.
Diffstat:
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/.zshenv b/.zshenv
@@ -3,6 +3,10 @@
# Default read-only permissions for group/other.
umask 022
+# Basics
+export EDITOR=vim
+export PAGER=less
+
# Set language to Australian English, currency to Japanese Yen.
export LANG=en_AU.UTF-8
export LANGUAGE=en_AU.UTF-8
@@ -13,10 +17,15 @@ export LC_MONETARY=ja_JP.UTF-8
export LC_NUMERIC=en_AU.UTF-8
export LC_TIME=en_AU.UTF-8
-# Use ibus for Japanese IME.
-export GTK_IM_MODULE=ibus
-export XMODIFIERS=@im=ibus
-export QT_IM_MODULE=ibus
+# GPG directory and TTY used for pinentry.
+export GNUPGHOME="$HOME/.gnupg"
+export GPG_TTY="$(tty)"
+
+# Google stuff.
+export P4CONFIG=.p4config
+export P4EDITOR=vim
+export GOMA_DIR="$HOME/src/goma"
+export GEM_HOME="$HOME/.gem"
# If a local python3 directory exists, add PYTHONPATH.
if [[ -d "$HOME/.local/lib/python3" ]]; then
diff --git a/.zshrc b/.zshrc
@@ -1,18 +1,5 @@
# .zshrc
-# Environment vars.
-export EDITOR=vim
-export GNUPGHOME="$HOME/.gnupg"
-export GOMA_DIR="$HOME/src/goma"
-export GEM_HOME="$HOME/.gem"
-
-# Set tty used for GPG pinentry.
-export GPG_TTY="$(tty)"
-
-# P4 config.
-export P4CONFIG=.p4config
-export P4EDITOR=vim
-
# History.
HISTFILE=~/.histfile
HISTSIZE=10000