From dfce3c52ba94ef755a19e08982d1d5af54ddf37d Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Fri, 20 Oct 2017 08:26:21 +0800 Subject: zsh: Move LS_COLORS set from profile to zsh/90-exports.zsh --- _profile | 5 ----- _zsh/20-colors.zsh | 7 ------- _zsh/90-exports.zsh | 13 +++++++++++++ 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/_profile b/_profile index cfb24ec..cb983e2 100644 --- a/_profile +++ b/_profile @@ -88,11 +88,6 @@ export VISUAL="${EDITOR}" export PAGER="less" export LESS="--ignore-case --raw-control-chars" -## LS colors -if _exists dircolors; then - eval $(dircolors -b) -fi - ## Start `gpg-agent` if not running if ! _running gpg-agent; then gpgconf --launch gpg-agent diff --git a/_zsh/20-colors.zsh b/_zsh/20-colors.zsh index b9a4797..427ea20 100644 --- a/_zsh/20-colors.zsh +++ b/_zsh/20-colors.zsh @@ -16,12 +16,5 @@ export PR_RED PR_GREEN PR_YELLOW PR_BLUE PR_WHITE PR_BLACK export PR_BOLD_RED PR_BOLD_GREEN PR_BOLD_YELLOW PR_BOLD_BLUE export PR_BOLD_WHITE PR_BOLD_BLACK -# colors for BSD ls -if [[ -n "${IS_BSD}" ]]; then - export CLICOLOR=1 - #export LSCOLORS=Gxfxcxdxbxegedabagacad - export LSCOLORS=exfxcxdxbxegedabagacad -fi - # vim: set ts=8 sw=4 tw=0 fenc=utf-8 ft=zsh: # diff --git a/_zsh/90-exports.zsh b/_zsh/90-exports.zsh index b321737..1472a7a 100644 --- a/_zsh/90-exports.zsh +++ b/_zsh/90-exports.zsh @@ -9,5 +9,18 @@ # This `GPG_TTY' variable should be set to the correct TTY where the shell # is running. See also `gpg-agent(1)' export GPG_TTY=$(tty) +# colors for BSD ls +if [[ -n "${IS_BSD}" ]]; then + export CLICOLOR=1 + export LSCOLORS=exfxcxdxbxegedabagacad +fi + +# Color setup for `ls': `LS_COLORS' +# NOTE: For unknown reason, the `LS_COLORS' variable get overridden when +# it is set in `~/.profile'. +if exists dircolors; then + eval $(dircolors -b) +fi + # vim: set ts=8 sw=4 tw=0 fenc=utf-8 ft=zsh: # -- cgit v1.2.2