From bd33ff52a3180e9098e0dac3eeff00c6373fc4de Mon Sep 17 00:00:00 2001 From: Thomas Preisner Date: Mon, 9 Oct 2017 22:38:28 +0200 Subject: [PATCH] zsh: merge colors.zsh into prompt.zsh --- zsh/colors.zsh | 14 -------------- zsh/prompt.zsh | 9 +++++++++ zshrc | 1 - 3 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 zsh/colors.zsh diff --git a/zsh/colors.zsh b/zsh/colors.zsh deleted file mode 100644 index 2eb0c88..0000000 --- a/zsh/colors.zsh +++ /dev/null @@ -1,14 +0,0 @@ -autoload colors; colors - -# Clear LSCOLORS -unset LSCOLORS - -# Main change, you can see directories on a dark background -#export LSCOLORS=gxfxcxdxbxegedabagacad - -export CLICOLOR=1 -if [[ $IS_MAC -eq 1 ]]; then - export LSCOLORS=gxfxcxdxbxegedabagacad -fi -export LS_COLORS=di='36;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:' - diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh index 5df4f47..3cad3ac 100644 --- a/zsh/prompt.zsh +++ b/zsh/prompt.zsh @@ -1,3 +1,12 @@ +# ===== use colorized output +autoload -Uz colors; colors + +if [[ $IS_MAC -eq 1 ]]; then + export CLICOLOR=1 + export LSCOLORS=gxfxcxdxbxegedabagacad +fi +export LS_COLORS=di='36;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:' + # ===== setopts and misc # only show RPROMPT on the current prompt setopt transient_rprompt # only show the rprompt on the current prompt diff --git a/zshrc b/zshrc index da107e2..b7695c6 100644 --- a/zshrc +++ b/zshrc @@ -3,7 +3,6 @@ source ~/.zsh/keybindings.zsh source ~/.zsh/setopt.zsh source ~/.zsh/general.zsh source ~/.zsh/checks.zsh -source ~/.zsh/colors.zsh source ~/.zsh/prompt.zsh source ~/.zsh/completion.zsh source ~/.zsh/history.zsh