X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=79e2a928302f778db97e9e095efe83b75debc5e7;hb=1c0f50e134c6368d9365e50f8809686fa34c1d5b;hp=7351026a8f65531e6052a7d0f3d82b636cf7ec70;hpb=c009782f6bce3f12a626b8de92742a958f60174c;p=dotfiles.git diff --git a/zsh/.zshrc b/zsh/.zshrc index 7351026..79e2a92 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -133,19 +133,22 @@ bindkey -s "OR" " git status --short\n" # F3 # grep {{{ GREP_ARGS=( - --color=always + --colour=always --with-filename --line-number --dereference-recursive + --binary-files=without-match + --exclude-dir=.git + --exclude-dir=.tags ) -LESS_COLORED=(less --RAW-CONTROL-CHARS) +LESS_COLOURED=(less --RAW-CONTROL-CHARS) g() { - grep $GREP_ARGS $@ | $LESS_COLORED + grep $GREP_ARGS $@ | $LESS_COLOURED } GS() { - grep $GREP_ARGS $@ | sort --numeric-sort | $LESS_COLORED + grep $GREP_ARGS $@ | sort --numeric-sort | $LESS_COLOURED } -alias -g G="| grep --color=always" +alias -g G="| grep --colour=always" alias gg="git grep " # }}} @@ -212,7 +215,7 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=cyan" # fzf {{{ export FZF_DEFAULT_OPTS="--color=16 --info=inline" cf() { - local dir=$(find ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print | + local dir=$(find -L ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print | fzf --height 40% --reverse --preview="tree -CN {}") [[ -z $dir ]] || cd $dir }