zsh: merge colors.zsh into prompt.zsh

This commit is contained in:
Thomas Preisner 2017-10-09 22:38:28 +02:00
parent 499bbaa823
commit bd33ff52a3
3 changed files with 9 additions and 15 deletions

View file

@ -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:'

View file

@ -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 # ===== setopts and misc
# only show RPROMPT on the current prompt # only show RPROMPT on the current prompt
setopt transient_rprompt # only show the rprompt on the current prompt setopt transient_rprompt # only show the rprompt on the current prompt

1
zshrc
View file

@ -3,7 +3,6 @@ source ~/.zsh/keybindings.zsh
source ~/.zsh/setopt.zsh source ~/.zsh/setopt.zsh
source ~/.zsh/general.zsh source ~/.zsh/general.zsh
source ~/.zsh/checks.zsh source ~/.zsh/checks.zsh
source ~/.zsh/colors.zsh
source ~/.zsh/prompt.zsh source ~/.zsh/prompt.zsh
source ~/.zsh/completion.zsh source ~/.zsh/completion.zsh
source ~/.zsh/history.zsh source ~/.zsh/history.zsh