Conflicts:
	.gitignore
	templates/zshrc.zsh-template
	tools/install.sh
This commit is contained in:
Gaetan Semet 2013-03-04 16:54:51 +01:00
commit baa421cbae
10 changed files with 124 additions and 16 deletions

View file

@ -23,6 +23,14 @@ alias please='sudo'
# Show history
alias history='fc -l 1'
# Enable ls colors
LS_OPTIONS='-hF'
if [ "$DISABLE_LS_COLORS" != "true" ]
then
# Find the option for using colors in ls, depending on the version: Linux or BSD
ls --color -d . &>/dev/null 2>&1 && alias ls="ls --color=tty $LS_OPTIONS" || alias ls="ls -G $LS_OPTIONS"
fi
# List direcory contents
alias lsa='ls -lah'
alias l='ls -lA1'
@ -31,4 +39,3 @@ alias la='ls -lA'
alias sl=ls # often screw this up
alias afind='ack-grep -il'

View file

@ -3,13 +3,6 @@ autoload colors; colors;
export LSCOLORS="Gxfxcxdxbxegedabagacad"
#export LS_COLORS
# Enable ls colors
if [ "$DISABLE_LS_COLORS" != "true" ]
then
# Find the option for using colors in ls, depending on the version: Linux or BSD
ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
fi
#setopt no_beep
setopt auto_cd
setopt multios