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 'upstream/master'

Browse source 
Conflicts:
	plugins/common-aliases/common-aliases.plugin.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Aaron Biggs 2014-07-29 14:49:44 -05:00
commit b28391cf7f
53 changed files with 503 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

16
templates/zshrc.zsh-template
View file

@ -26,8 +26,8 @@ ZSH_THEME="agnoster"
# Uncomment the following line to disable auto-setting terminal title.
# DISABLE_AUTO_TITLE="true"
# Uncomment the following line to disable command auto-correction.
# DISABLE_CORRECTION="true"
# Uncomment the following line to enable command auto-correction.
# ENABLE_CORRECTION="true"
# Uncomment the following line to display red dots whilst waiting for completion.
# COMPLETION_WAITING_DOTS="true"
@ -48,7 +48,8 @@ ZSH_THEME="agnoster"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(battery capistrano common-aliases git github laravel4 rbenv sublime systemadmin)
# Add wisely, as too many plugins slow down shell startup.
plugins=(capistrano common-aliases git laravel4 rbenv systemadmin)
source $ZSH/oh-my-zsh.sh
@ -72,3 +73,12 @@ export PATH=:/usr/local/bin:$HOME/bin:$PATH
# ssh
# export SSH_KEY_PATH="~/.ssh/dsa_id"
# Set personal aliases, overriding those provided by oh-my-zsh libs,
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
# For a full list of active aliases, run `alias`.
#
# Example aliases
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"