linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-27 03:05:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'cadusk/master'

Browse source 
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2014-10-07 11:53:12 +02:00
commit cf1c065d71
5 changed files with 54 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
templates/zshrc-linux.zsh
View file

@ -57,13 +57,13 @@ ZSH_HIGHLIGHT_STYLES[globbing]='none'
zstyle ':completion:*:descriptions' format '%B%d%b'
# Customize to your needs...
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
if [ -e $HOME/.local/bin ]; then export PATH="$HOME/.local/bin:$PATH"; fi
if [ -e $HOME/appengine ]; then export PATH="$HOME/appengine:$PATH"; fi
if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
#
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
# source .profile is any (proxy settings,...)
[ -f $HOME/.profile ] && source $HOME/.profile
@ -71,4 +71,9 @@ if [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
[ "$TERM" = "xterm" ] && TERM="xterm-256color"
source $ZSH/oh-my-zsh.sh
# Enviroment variables overwrite
export EDITOR='vim'
export LESS='-RX'
unsetopt correctall

8
templates/zshrc-mac.zsh
View file

@ -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