|
|
@ -15,7 +15,7 @@ if is-callable 'dircolors'; then |
|
|
|
# GNU core utilities. |
|
|
|
# GNU core utilities. |
|
|
|
alias ls='ls --group-directories-first' |
|
|
|
alias ls='ls --group-directories-first' |
|
|
|
|
|
|
|
|
|
|
|
if zstyle -t ':omz:alias:ls' color; then |
|
|
|
if zstyle -t ':omz:module:alias:ls' color; then |
|
|
|
if [[ -s "$HOME/.dir_colors" ]]; then |
|
|
|
if [[ -s "$HOME/.dir_colors" ]]; then |
|
|
|
eval "$(dircolors "$HOME/.dir_colors")" |
|
|
|
eval "$(dircolors "$HOME/.dir_colors")" |
|
|
|
else |
|
|
|
else |
|
|
@ -27,7 +27,7 @@ if is-callable 'dircolors'; then |
|
|
|
fi |
|
|
|
fi |
|
|
|
else |
|
|
|
else |
|
|
|
# BSD core utilities. |
|
|
|
# BSD core utilities. |
|
|
|
if zstyle -t ':omz:alias:ls' color; then |
|
|
|
if zstyle -t ':omz:module:alias:ls' color; then |
|
|
|
export LSCOLORS="exfxcxdxbxegedabagacad" |
|
|
|
export LSCOLORS="exfxcxdxbxegedabagacad" |
|
|
|
alias ls="ls -G" |
|
|
|
alias ls="ls -G" |
|
|
|
else |
|
|
|
else |
|
|
@ -102,8 +102,8 @@ else |
|
|
|
alias topc='top -o cpu' |
|
|
|
alias topc='top -o cpu' |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
# Diff/Make |
|
|
|
# Diff |
|
|
|
if zstyle -t ':omz:alias:diff' color; then |
|
|
|
if zstyle -t ':omz:module:alias:diff' color; then |
|
|
|
function diff { |
|
|
|
function diff { |
|
|
|
if (( $+commands[colordiff] )); then |
|
|
|
if (( $+commands[colordiff] )); then |
|
|
|
"$commands[diff]" --unified "$@" | colordiff --difftype diffu |
|
|
|
"$commands[diff]" --unified "$@" | colordiff --difftype diffu |
|
|
@ -130,6 +130,7 @@ if zstyle -t ':omz:alias:diff' color; then |
|
|
|
print "zsh: command not found: $0" >&2 |
|
|
|
print "zsh: command not found: $0" >&2 |
|
|
|
fi |
|
|
|
fi |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if (( $+commands[colormake] )); then |
|
|
|
if (( $+commands[colormake] )); then |
|
|
|
alias make='colormake' |
|
|
|
alias make='colormake' |
|
|
|