Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2016-08-29 18:00:33 +02:00
commit c97f1d133d
37 changed files with 760 additions and 209 deletions

View file

@ -1,10 +1,12 @@
# If you come from bash you might have to change your $PATH.
# export PATH=$HOME/bin:/usr/local/bin:$PATH
# Path to your oh-my-zsh installation.
export ZSH=$HOME/.oh-my-zsh
# Set name of the theme to load.
# Look in ~/.oh-my-zsh/themes/ (show features by tools/list_theme.sh)
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
# Set name of the theme to load. Optionally, if you set this to "random"
# it'll load a random theme each time that oh-my-zsh is loaded.
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
ZSH_THEME="stibbons"
# Uncomment the following line to use case-sensitive completion.
@ -52,13 +54,12 @@ DISABLE_AUTO_UPDATE="true"
plugins=(git)
zstyle ':completion:*:descriptions' format '%B%d%b'
source $ZSH/oh-my-zsh.sh
# User configuration
# export PATH="/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
# export MANPATH="/usr/local/man:$MANPATH"
source $ZSH/oh-my-zsh.sh
# You may need to manually set your language environment
# export LANG=en_US.UTF-8