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

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 2013-12-19 17:27:55 +01:00
commit 4ab34ba94c
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
templates/zshrc-linux.zsh
View file

@ -62,10 +62,18 @@ 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 [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi if [ -e $HOME/bin ]; then export PATH="$HOME/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 [ -e $HOME/.cabal/bin ]; then export PATH="$HOME/.cabal/bin:$PATH"; fi
unsetopt correctall
# source .profile is any (proxy settings,...) # source .profile is any (proxy settings,...)
[ -f $HOME/.profile ] && source $HOME/.profile [ -f $HOME/.profile ] && source $HOME/.profile
[ "$TERM" = "xterm" ] && TERM="xterm-256color" [ "$TERM" = "xterm" ] && TERM="xterm-256color"
# Aliases
alias ta='tmux attach -t'
alias tl='tmux list-session'
alias ts='tmux new-session'
source $ZSH/oh-my-zsh.sh
unsetopt correctall

11
templates/zshrc-mac.zsh
View file

@ -40,12 +40,15 @@ source $ZSH/oh-my-zsh.sh
zstyle ':completion:*:descriptions' format '%B%d%b' zstyle ':completion:*:descriptions' format '%B%d%b'
# Customize to your needs... # Aliases
alias ta='tmux attach -t'
alias tl='tmux list-session'
alias ts='tmux new-session'
if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi # Compilation flags
if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi # export ARCHFLAGS="-arch x86_64"
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi source $ZSH/oh-my-zsh.sh
unsetopt correctall unsetopt correctall
if [ -e ~/.profile ]; then source ~/.profile; fi if [ -e ~/.profile ]; then source ~/.profile; fi

3
templates/zshrc.zsh-template
View file

@ -50,7 +50,6 @@ plugins=(git)
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
zstyle ':completion:*:descriptions' format '%B%d%b' zstyle ':completion:*:descriptions' format '%B%d%b'
# User configuration # User configuration
export PATH=$HOME/bin:/usr/local/bin:$PATH export PATH=$HOME/bin:/usr/local/bin:$PATH
@ -73,4 +72,4 @@ if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
# export SSH_KEY_PATH="~/.ssh/dsa_id" # export SSH_KEY_PATH="~/.ssh/dsa_id"
if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
unsetopt correctall unsetopt correctall