mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-02-13 03:01:32 +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
4ab34ba94c
3 changed files with 17 additions and 7 deletions
|
|
@ -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 [ -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
|
||||
unsetopt correctall
|
||||
|
||||
# source .profile is any (proxy settings,...)
|
||||
[ -f $HOME/.profile ] && source $HOME/.profile
|
||||
|
||||
[ "$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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue