mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-23 13:46:47 +00:00
Refactored aliases.
This commit is contained in:
parent
a54974864c
commit
7223cd2361
@ -2,16 +2,9 @@ setopt correct # Correct commands.
|
|||||||
setopt correct_all # Correct all arguments.
|
setopt correct_all # Correct all arguments.
|
||||||
|
|
||||||
# The 'ls' Family
|
# The 'ls' Family
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
if [[ "$DISABLE_COLOR" != 'true' ]]; then
|
if [[ "$DISABLE_COLOR" != 'true' ]]; then
|
||||||
if (( ${+commands[dircolors]} )); then
|
if [[ -f "$HOME/.dir_colors" ]] && ( (( $+commands[dircolors] )) || ( (( $+plugins[(er)gnu-utils] )) && (( $+commands[gdircolors] )) ) ); then
|
||||||
dircolors="${commands[dircolors]}"
|
eval $("${commands[dircolors]:-$commands[gdircolors]}" "$HOME/.dir_colors")
|
||||||
fi
|
|
||||||
if (( ${+commands[gdircolors]} )); then
|
|
||||||
dircolors="${commands[gdircolors]}"
|
|
||||||
fi
|
|
||||||
if [[ -x "$dircolors" ]] && [[ -e "$HOME/.dir_colors" ]]; then
|
|
||||||
eval $("$dircolors" "$HOME/.dir_colors")
|
|
||||||
alias ls='ls -hF --group-directories-first --color=auto'
|
alias ls='ls -hF --group-directories-first --color=auto'
|
||||||
else
|
else
|
||||||
export CLICOLOR=1
|
export CLICOLOR=1
|
||||||
@ -20,6 +13,7 @@ if [[ "$DISABLE_COLOR" != 'true' ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
alias l='ls -1A' # Show files in one column.
|
||||||
alias ll='ls -lh' # Show human readable.
|
alias ll='ls -lh' # Show human readable.
|
||||||
alias la='ls -lhA' # Show hidden files.
|
alias la='ls -lhA' # Show hidden files.
|
||||||
alias lx='ls -lhXB' # Sort by extension.
|
alias lx='ls -lhXB' # Sort by extension.
|
||||||
@ -32,54 +26,65 @@ alias lr='ls -lhR' # Recursive ls.
|
|||||||
alias sl='ls' # I often screw this up.
|
alias sl='ls' # I often screw this up.
|
||||||
|
|
||||||
# General
|
# General
|
||||||
# ------------------------------------------------------------------------------
|
alias _='sudo'
|
||||||
|
alias b="$BROWSER"
|
||||||
alias cd='nocorrect cd'
|
alias cd='nocorrect cd'
|
||||||
alias cp='nocorrect cp -i'
|
alias cp='nocorrect cp -i'
|
||||||
|
alias df='df -kh'
|
||||||
|
alias du='du -kh'
|
||||||
|
alias e="$EDITOR"
|
||||||
alias find='noglob find'
|
alias find='noglob find'
|
||||||
alias gcc='nocorrect gcc'
|
alias gcc='nocorrect gcc'
|
||||||
|
alias history='fc -l 1'
|
||||||
alias ln='nocorrect ln -i'
|
alias ln='nocorrect ln -i'
|
||||||
|
alias locate='noglob locate'
|
||||||
alias man='nocorrect man'
|
alias man='nocorrect man'
|
||||||
alias mkdir='nocorrect mkdir -p'
|
alias mkdir='nocorrect mkdir -p'
|
||||||
alias mv='nocorrect mv -i'
|
alias mv='nocorrect mv -i'
|
||||||
|
alias po='popd'
|
||||||
|
alias pu='pushd'
|
||||||
|
alias rake='noglob rake'
|
||||||
alias rm='nocorrect rm -i'
|
alias rm='nocorrect rm -i'
|
||||||
alias scp='nocorrect scp'
|
alias scp='nocorrect scp'
|
||||||
alias du='du -kh'
|
|
||||||
alias df='df -kh'
|
|
||||||
alias pu='pushd'
|
|
||||||
alias po='popd'
|
|
||||||
alias _='sudo'
|
|
||||||
alias o='open'
|
|
||||||
alias e="$EDITOR"
|
|
||||||
alias v="$PAGER"
|
|
||||||
alias b="$BROWSER"
|
|
||||||
alias history='fc -l 1'
|
|
||||||
alias get='curl -C - -O'
|
|
||||||
alias afind='ack -il'
|
|
||||||
alias type='type -a'
|
alias type='type -a'
|
||||||
alias ssh='ssh -X'
|
alias v="$PAGER"
|
||||||
|
|
||||||
|
# Mac OS X
|
||||||
|
if [[ "$OSTYPE" != darwin* ]]; then
|
||||||
|
alias open='xdg-open'
|
||||||
|
alias get='wget --continue --progress=bar'
|
||||||
|
|
||||||
|
if (( $+commands[xclip] )); then
|
||||||
|
alias pbcopy='xclip -selection clipboard -in'
|
||||||
|
alias pbpaste='xclip -selection clipboard -out'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if (( $+commands[xsel] )); then
|
||||||
|
alias pbcopy='xsel --clipboard --input'
|
||||||
|
alias pbpaste='xsel --clipboard --output'
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
alias get='curl --continue-at - --location --progress-bar --remote-name'
|
||||||
|
fi
|
||||||
|
|
||||||
|
alias o='open'
|
||||||
alias pbc='pbcopy'
|
alias pbc='pbcopy'
|
||||||
alias pbp='pbpaste'
|
alias pbp='pbpaste'
|
||||||
alias print-path='echo -e ${PATH//:/\\n}'
|
|
||||||
alias t="t --task-dir ~/.tasks --list todo.txt --delete-if-empty"
|
|
||||||
|
|
||||||
(( $+commands[ebuild] )) && alias ebuild='nocorrect ebuild'
|
# Top
|
||||||
(( $+commands[gist] )) && alias gist='nocorrect gist'
|
if (( $+commands[htop] )); then
|
||||||
(( $+commands[heroku] )) && alias heroku='nocorrect heroku'
|
|
||||||
(( $+commands[hpodder] )) && alias hpodder='nocorrect hpodder'
|
|
||||||
(( $+commands[mysql] )) && alias mysql='nocorrect mysql'
|
|
||||||
|
|
||||||
if [[ -x "${commands[htop]}" ]]; then
|
|
||||||
alias top=htop
|
alias top=htop
|
||||||
else
|
else
|
||||||
alias topm='top -o vsize'
|
alias topm='top -o vsize'
|
||||||
alias topc='top -o cpu'
|
alias topc='top -o cpu'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Diff/Make
|
||||||
if [[ "$DISABLE_COLOR" != 'true' ]]; then
|
if [[ "$DISABLE_COLOR" != 'true' ]]; then
|
||||||
if [[ -x "${commands[colordiff]}" ]]; then
|
if (( $+commands[colordiff] )); then
|
||||||
alias diff='colordiff -u'
|
alias diff='colordiff -u'
|
||||||
compdef colordiff=diff
|
compdef colordiff=diff
|
||||||
elif [[ -x "${commands[git]}" ]]; then
|
elif (( $+commands[git] )); then
|
||||||
function diff() {
|
function diff() {
|
||||||
git --no-pager diff --color=always --no-ext-diff --no-index "$@";
|
git --no-pager diff --color=always --no-ext-diff --no-index "$@";
|
||||||
}
|
}
|
||||||
@ -88,7 +93,7 @@ if [[ "$DISABLE_COLOR" != 'true' ]]; then
|
|||||||
alias diff='diff -u'
|
alias diff='diff -u'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -x "${commands[colormake]}" ]]; then
|
if (( $+commands[colormake] )); then
|
||||||
alias make='colormake'
|
alias make='colormake'
|
||||||
compdef colormake=make
|
compdef colormake=make
|
||||||
fi
|
fi
|
||||||
@ -96,7 +101,19 @@ fi
|
|||||||
|
|
||||||
# Terminal Multiplexer
|
# Terminal Multiplexer
|
||||||
alias sl="screen -list"
|
alias sl="screen -list"
|
||||||
alias sr="screen -a -A -U -D -R"
|
|
||||||
alias sn="screen -U -S"
|
alias sn="screen -U -S"
|
||||||
alias tl="tmux list-sessions"
|
alias sr="screen -a -A -U -D -R"
|
||||||
|
|
||||||
|
if (( $+commands[tmux] )); then
|
||||||
|
alias ta="tmux attach-session"
|
||||||
|
alias tl="tmux list-sessions"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Miscellaneous
|
||||||
|
(( $+commands[ack] )) && alias afind='ack -il'
|
||||||
|
(( $+commands[ebuild] )) && alias ebuild='nocorrect ebuild'
|
||||||
|
(( $+commands[gist] )) && alias gist='nocorrect gist'
|
||||||
|
(( $+commands[heroku] )) && alias heroku='nocorrect heroku'
|
||||||
|
(( $+commands[hpodder] )) && alias hpodder='nocorrect hpodder'
|
||||||
|
(( $+commands[mysql] )) && alias mysql='nocorrect mysql'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user