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

Merge branch 'master' of https://github.com/Stibbons/oh-my-zsh

Browse source 
Conflicts:
	README.textile
	custom/plugins/launch_trial/_launch_trial.sh
	plugins/encode64/encode64.plugin.zsh
	plugins/git/git.plugin.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
	tools/install.sh

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
This commit is contained in:
Gaetan Semet 2013-03-27 16:51:05 +01:00
commit b964433381
8 changed files with 100 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
templates/zshrc-linux.zsh
View file

@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
# Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
ZSH_THEME="mh"
ZSH_THEME="stibbons"
# Example aliases
# alias zshconfig="mate ~/.zshrc"
@ -15,7 +15,7 @@ ZSH_THEME="mh"
# CASE_SENSITIVE="true"
# Comment this out to disable weekly auto-update checks
DISABLE_AUTO_UPDATE="true"
DISABLE_AUTO_UPDATE="false"
# Uncomment following line if you want to disable colors in ls
# DISABLE_LS_COLORS="true"
@ -32,7 +32,7 @@ DISABLE_VENV_CD="true"
# 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=(git python pythonbrew repo cp buildbot rsync git-remote-branch command-not-found debian dircycle encode64 lol extract launch_trial common-aliases vim-scp)
plugins=(git python pythonbrew repo cp buildbot rsync git-remote-branch command-not-found debian dircycle encode64 lol extract launch_trial common-aliases)
source $ZSH/oh-my-zsh.sh
# source `which virtualenvwrapper.sh`

2
templates/zshrc-mac.zsh
View file

@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
# Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
ZSH_THEME="mh"
ZSH_THEME="stibbons"
# Example aliases
# alias zshconfig="mate ~/.zshrc"

4
templates/zshrc.zsh-template
View file

@ -5,7 +5,7 @@ ZSH=$HOME/.oh-my-zsh
# Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
ZSH_THEME="gsemet"
ZSH_THEME="stibbons"
# Example aliases
# alias zshconfig="mate ~/.zshrc"
@ -37,6 +37,8 @@ plugins=(git python pythonbrew repo cp buildbot rsync git-remote-branch command-
source $ZSH/oh-my-zsh.sh
source `which virtualenvwrapper.sh`
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