Merge branch 'master' into everard

This commit is contained in:
Thomas Ruoff
2015-06-24 12:02:51 +02:00
4 changed files with 16 additions and 12 deletions

6
.gitmodules vendored
View File

@@ -1,6 +1,6 @@
[submodule "base16-shell"]
path = base16-shell
url = git@github.com:chriskempson/base16-shell.git
[submodule "antigen"]
path = antigen
url = https://github.com/zsh-users/antigen.git
[submodule "zgen"]
path = zgen
url = git@github.com:tarjoilija/zgen.git

Submodule antigen deleted from 7860ce7aec

1
zgen Submodule

Submodule zgen added at 5517f92ae5

20
zshrc
View File

@@ -1,14 +1,18 @@
source ~/.dotfiles/antigen/antigen.zsh
# load zgen
source "${HOME}/.dotfiles/zgen/zgen.zsh"
antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle peterhurford/git-it-on.zsh
antigen bundle gerges/oh-my-zsh-jira-plus
if ! zgen saved; then
echo "Creating a zgen save"
antigen use oh-my-zsh
zgen oh-my-zsh
zgen oh-my-zsh themes/robbyrussell
antigen bundle tmux
antigen theme robbyrussell
zgen load zsh-users/zsh-completions src
zgen load zsh-users/zsh-syntax-highlighting
antigen apply
zgen load peterhurford/git-it-on.zsh
zgen load gerges/oh-my-zsh-jira-plus
zgen save
fi