diff --git a/1bash.d/0_colors.sh b/1bash.d/0_colors.sh index 74d41c1..15f0145 100644 --- a/1bash.d/0_colors.sh +++ b/1bash.d/0_colors.sh @@ -1,4 +1,3 @@ - #!/bin/bash if [ -f ~/.dircolors ]; then @@ -7,10 +6,12 @@ elif [ -f $ONE_BASH/dircolors ]; then eval "$( dircolors -b $ONE_BASH/dircolors )" fi +if ls --color=auto > /dev/null 2>&1; then colorflag="--color=auto"; else colorflag="-G"; fi; + # enable color support of ls and also add handy aliases -# alias ls='ls --color=auto' -alias dir='dir --color=auto' -alias vdir='vdir --color=auto' -alias grep='grep --color=auto' -alias fgrep='fgrep --color=auto' -alias egrep='egrep --color=auto' +alias ls='ls $colorflag' +alias dir='dir $colorflag' +alias vdir='vdir $colorflag' +alias grep='grep $colorflag' +alias fgrep='fgrep $colorflag' +alias egrep='egrep $colorflag' diff --git a/1bash.d/aliases.sh b/1bash.d/aliases.sh index ed74e55..2b76a3e 100644 --- a/1bash.d/aliases.sh +++ b/1bash.d/aliases.sh @@ -21,21 +21,16 @@ alias where=which # sometimes i forget # ls make colerfull in color.sh # always use color, even when piping (to awk,grep,etc) -# if ls --color=auto > /dev/null 2>&1; then colorflag="--color=auto"; else colorflag="-G"; fi; # export CLICOLOR_FORCE=1 # ls options: A = include hidden (but not . or ..), F = put `/` after folders, h = byte unit suffixes -alias lsa="ls -lAhF --color=auto --group-directories-first" -alias lsd="ls --color=auto | grep '^d'" # only directories +alias lsa="ls -lAhF --group-directories-first" +alias lsd="ls | grep '^d'" # only directories # `la` defined in .functions -### - # `cat` with beautiful colors. requires: sudo easy_install -U Pygments #alias c="pygmentize -O style=monokai -f console256 -g" -### - # Networking. IP address, dig, DNS # alias ip="dig +short myip.opendns.com @resolver1.opendns.com" # alias dig="dig +nocmd any +multiline +noall +answer"