mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-03-20 03:13:33 +01:00
Merge branch 'master' of https://github.com/netzverweigerer/oh-my-zsh
Conflicts: zshrc
This commit is contained in:
commit
95843ce2e6
1 changed files with 8 additions and 2 deletions
10
zshrc
10
zshrc
|
|
@ -155,6 +155,11 @@ if [[ "$OS_TYPE" == "FreeBSD" ]]; then
|
|||
fi
|
||||
fi
|
||||
|
||||
if [[ "$OS_TYPE" == "Linux" ]]; then
|
||||
LS_COMMAND=ls
|
||||
dircolors_enable=1
|
||||
fi
|
||||
|
||||
# enable ls colorization:
|
||||
if [ "$TERM" != "dumb" ]; then
|
||||
if [[ "$dircolors_enable" == 1 ]]; then
|
||||
|
|
@ -212,8 +217,9 @@ alias grep="grep --color='always'"
|
|||
alias less='less -R'
|
||||
alias diff='colordiff'
|
||||
|
||||
|
||||
# sudo shell with "s"
|
||||
alias s="sudo -s -E"
|
||||
|
||||
|
||||
# don't require "rehash" after installing a package
|
||||
setopt nohashdirs
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue