no submodule base16

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "zsh/dircolors-solarized"]
 	path = zsh/dircolors-solarized
 	url = git@github.com:webgefrickel/dircolors-solarized.git
+[submodule "zsh/base16-shell"]
+	path = zsh/base16-shell
+	url = git@github.com:chriskempson/base16-shell.git

aliases

@@ -39,7 +39,7 @@ alias l='gls -al --color=auto'
 
 # Gitty gitgit
 alias g="git"
-alias gf="git flow"
+alias gf="git-flow"
 alias gst="git status"
 alias ggpl='git pull origin $(current_branch)'
 alias ggps='git push origin $(current_branch)'
@@ -60,12 +60,6 @@ alias devs='apachestop && mysqlstop'
 alias devr='devs && dev'
 
 
-# grunt
-alias gr='grunt'
-alias grw='grunt watch'
-alias grd='grunt deploy'
-
-
 # tmux
 alias t='tmux -u -2'
 alias ta='tmux attach'
@@ -86,13 +80,6 @@ alias phpini='vim /usr/local/etc/php/5.5/php.ini'
 alias httpconf='vim /usr/local/etc/apache2/httpd.conf'
 
 
-# vagrant stuff
-alias vu='vagrant up'
-alias vr='vagrant reload'
-alias vp='vagrant provision'
-alias vh='vagrant halt'
-
-
 # often used folder shortcuts
 alias drop='cd ~/Dropbox && ls -al'
 alias web='cd ~/Sites && ls -al'
@@ -103,7 +90,6 @@ alias dot='cd ~/Dotfiles && ls -al'
 # random usefull stuff
 alias dnsflush='sudo dscacheutil -flushcache'
 alias cleanup="find . -type f -name '*.DS_Store' -ls -delete"
-alias psa="ps aux"
 
 
 # imagemagick downsampling shortcuts (c&p retina folder, run, done!)

exports

@@ -8,13 +8,11 @@ export HOMEBREW_CASK_OPTS="--appdir=/Applications"
 export PATH=$HOME/.rbenv/shims:$PATH
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 export PATH=$HOME/.tmuxifier/bin:$PATH
-
-export NODE_PATH=$NODE_PATH:/usr/local/lib/node_modules
+export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH
+export MANPATH=/usr/local/share/man:$MANPATH
 
 fpath=($HOME/dotfiles/zsh/zsh-completions/src $fpath)
 
-export MANPATH=/usr/local/share/man:$MANPATH
-
 # disable stupid ._ and dsstore files
 export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
 export COPYFILE_DISABLE=true
@@ -39,7 +37,6 @@ export GREP_COLOR='1;32'
 ## pager
 export PAGER="less"
 export LESS="-R"
-
 export LC_CTYPE=$LANG
 
 export RBENV_VERSION="2.1.2"

functions

@@ -1,6 +1,6 @@
 # a small function for finding stuff
-function fname() { 
-  find . -iname "*$@*"; 
+function fname() {
+  find . -iname "*$@*";
 }
 
 
@@ -11,8 +11,8 @@ function take() {
 
 
 # find process by name and kill them
-function grepkill() { 
-  ps -axf | grep -v grep | grep "$@" | awk '{print $2}' | xargs kill 
+function grepkill() {
+  ps -axf | grep -v grep | grep "$@" | awk '{print $2}' | xargs kill
 }
 
 

vimrc

@@ -67,6 +67,7 @@ NeoBundle 'tpope/vim-markdown'
 " Color themes
 "======================================================================
 
+NeoBundle 'chriskempson/base16-vim'
 NeoBundle 'altercation/vim-colors-solarized'
 
 
@@ -187,13 +188,15 @@ set ch=2            " command window is 2 high
 set cpo+=$          " Add a $ to the end of a selection
 set cpo+=J          " 2 spaces after a sentence for easier text manupulation
 
-colorscheme solarized
 set background=dark " and a dark background of course
 set t_Co=256        " 256 color terminal FTW
-let g:solarized_termtrans = 1
+let base16colorspace = 256
+colorscheme base16-solarized
+" colorscheme solarized
+" let g:solarized_termtrans = 1
 " minor optical fix vor syntastic
-highlight SignColumn ctermbg=8
-highlight Comment cterm=italic
+" highlight SignColumn ctermbg=8
+" highlight Comment cterm=italic
 
 
 "======================================================================

zshrc

@@ -4,13 +4,6 @@ for file in ~/dotfiles/{exports,aliases,functions}; do
 done
 unset file
 
-
-# nice dircolors -- this requires installed coreutils and lscolors fallback
-autoload colors; colors;
-export LSCOLORS="Gxfxcxdxbxegedabagacad"
-eval `gdircolors $HOME/dotfiles/zsh/dircolors-solarized/dircolors.256dark`
-
-
 # a nice prompt
 autoload -U promptinit && promptinit
 setopt prompt_subst
@@ -22,10 +15,10 @@ autoload bashcompinit && bashcompinit
 
 # autocomplete for the git alias
 compdef g=git
+compdef gf=git-flow
 
 # case-insensitive (all),partial-word and then substring completion
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' \
-    'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
@@ -64,6 +57,12 @@ setopt long_list_jobs
 source $HOME/dotfiles/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source $HOME/dotfiles/zsh/forklift/forklift.plugin.zsh
 
+# nice dircolors -- this requires installed coreutils and lscolors fallback
+autoload colors; colors;
+export LSCOLORS="Gxfxcxdxbxegedabagacad"
+eval `gdircolors $HOME/dotfiles/zsh/dircolors-solarized/dircolors.256dark`
+
+
 # load tmuxifier
 eval "$(tmuxifier init -)"