mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-03-06 03:10:35 +01:00
Merge remote-tracking branch 'cadusk/master'
Conflicts: README.textile lib/aliases.zsh templates/zshrc-linux.zsh templates/zshrc-mac.zsh templates/zshrc.zsh-template
This commit is contained in:
commit
cf1c065d71
5 changed files with 54 additions and 16 deletions
|
|
@ -46,13 +46,15 @@ zstyle ':completion:*:descriptions' format '%B%d%b'
|
|||
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
|
||||
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
|
||||
|
||||
# Compilation flags
|
||||
# export ARCHFLAGS="-arch x86_64"
|
||||
|
||||
# MacOSX specific aliases
|
||||
alias bu='brew update && brew upgrade'
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# Enviroment variables overwrite
|
||||
export EDITOR='vim'
|
||||
export LESS='-RX'
|
||||
|
||||
unsetopt correctall
|
||||
|
||||
if [ -e ~/.profile ]; then source ~/.profile; fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue