From cc42a8645980fbadbaa80d8a1a3730248365c520 Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 15 Jun 2015 20:16:18 +0200
Subject: [PATCH] use antigen

---
 .gitmodules |  6 ++---
 antigen     |  1 +
 oh-my-zsh   |  1 -
 zshenv      | 24 +++++++++--------
 zshrc       | 74 ++++++-----------------------------------------------
 5 files changed, 26 insertions(+), 80 deletions(-)
 create mode 160000 antigen
 delete mode 160000 oh-my-zsh

diff --git a/.gitmodules b/.gitmodules
index 3da96cf..879097d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "oh-my-zsh"]
-	path = oh-my-zsh
-	url = git@github.com:robbyrussell/oh-my-zsh.git
 [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
diff --git a/antigen b/antigen
new file mode 160000
index 0000000..7860ce7
--- /dev/null
+++ b/antigen
@@ -0,0 +1 @@
+Subproject commit 7860ce7aecdbed8fd8ff75472ac59c52c2ac9a7e
diff --git a/oh-my-zsh b/oh-my-zsh
deleted file mode 160000
index 1b7a3ea..0000000
--- a/oh-my-zsh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1b7a3ea99a8b566510ab7881063148c43be6b98d
diff --git a/zshenv b/zshenv
index 593498d..c36716a 100644
--- a/zshenv
+++ b/zshenv
@@ -1,8 +1,8 @@
-##################
+########################
 # Source Things
-#################
+########################
 
-# solarized dircolors
+# dircolors
 [ -s ~/.dircolors ] && . ~/.dircolors
 
 # extend path
@@ -10,20 +10,24 @@ export PATH=$HOME/local/bin:$PATH
 
 # nvm
 export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
-
-# todo.sh
-alias t=todo.sh
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" && nvm use > /dev/null
 
 # Base16 Shell
 BASE16_SCHEME="solarized"
 BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
 [[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
 
+########################
+# Dist related settings
+########################
 DIST=$(lsb_release -si)
-case $DIST in
+case DIST in
     Arch )
-        # use python 2.7 by default
-        export PYTHON=python2
         ;;
 esac
+
+########################
+# Aliases
+########################
+alias g=git
+rl () { $(npm bin)/$* }
diff --git a/zshrc b/zshrc
index 5a25a75..506c48a 100644
--- a/zshrc
+++ b/zshrc
@@ -1,72 +1,14 @@
-export ZSH=$HOME/.oh-my-zsh
+source ~/.dotfiles/antigen/antigen.zsh
 
-ZSH_THEME="pygmalion"
+antigen bundle zsh-users/zsh-syntax-highlighting
+antigen bundle peterhurford/git-it-on.zsh
+antigen bundle gerges/oh-my-zsh-jira-plus
 
-plugins=(bower gitfast git-extras node npm pass screen vi-mode tmux)
+antigen use oh-my-zsh
 
-case $(hostname) in
-    t430s-arch|pi)
-        plugins+=(archlinux systemd)
-        ;;
-    cassiopeia.uberspace.de)
-        plugins+=()
-        ;;
-    everard)
-        plugins+=(debian jira)
-        ;;
-esac
+antigen bundle command-not-found
+antigen theme robbyrussell
 
-source $ZSH/oh-my-zsh.sh
-
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
-
-# turn of autocorrection
-unsetopt correct_all
-
-#################
-## Keybindings
-################
-bindkey "^P" vi-up-line-or-history
-bindkey "^N" vi-down-line-or-history
-
-bindkey "^[[1~" vi-beginning-of-line   # Home
-bindkey "^[[4~" vi-end-of-line         # End
-bindkey '^[[2~' beep                   # Insert
-bindkey '^[[3~' delete-char            # Del
-bindkey '^[[5~' vi-backward-blank-word # Page Up
-bindkey '^[[6~' vi-forward-blank-word  # Page Down
-
-bindkey -M viins '^r' history-incremental-search-backward
-bindkey -M vicmd '^r' history-incremental-search-backward
-
-bindkey -a 'gg' beginning-of-buffer-or-history
-bindkey -a 'g~' vi-oper-swap-case
-bindkey -a G end-of-buffer-or-history
-
-bindkey -a u undo
-bindkey -a '^R' redo
-bindkey '^?' backward-delete-char
-bindkey '^H' backward-delete-char
+antigen apply
 
 
-TRAPWINCH() {
-  zle && { zle reset-prompt; zle -R }
-}
-
-##################
-# Source Things
-#################
-
-# solarized dircolors
-source ~/.dircolors
-
-# nvm
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
-
-# rvm
-if [ -s "$HOME/.rvm/scripts/rvm" ] ; then
-    source $HOME/.rvm/scripts/rvm
-    export PATH="$PATH:$HOME/.rvm/bin"
-fi