Merge remote-tracking branch 'origin/master' into everard

Conflicts:
	zshenv

.gitmodules

@@ -4,3 +4,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

Xresources

@@ -62,73 +62,104 @@ URxvt.saveLines:            65536
 ! <CTRL>+<PRINT> : current screen and scrollbackbuffer
 URxvt.print-pipe:           cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S'))
 
-! Solarized color scheme for the X Window System
+! Base16 Solarized Dark
+! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)
+
+#define base00 #002b36
+#define base01 #073642
+#define base02 #586e75
+#define base03 #657b83
+#define base04 #839496
+#define base05 #93a1a1
+#define base06 #eee8d5
+#define base07 #fdf6e3
+#define base08 #dc322f
+#define base09 #cb4b16
+#define base0A #b58900
+#define base0B #859900
+#define base0C #2aa198
+#define base0D #268bd2
+#define base0E #6c71c4
+#define base0F #d33682
+
+*.foreground:   base05
+*.background:   base00
+*.cursorColor:  base05
+
+*.color0:       base00
+*.color1:       base08
+*.color2:       base0B
+*.color3:       base0A
+*.color4:       base0D
+*.color5:       base0E
+*.color6:       base0C
+*.color7:       base05
+
+*.color8:       base03
+*.color9:       base08
+*.color10:      base0B
+*.color11:      base0A
+*.color12:      base0D
+*.color13:      base0E
+*.color14:      base0C
+*.color15:      base07
+
+! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
+! use 'shell' template to set these if necessary
+*.color16:      base09
+*.color17:      base0F
+*.color18:      base01
+*.color19:      base02
+*.color20:      base04
+*.color21:      base06
+
+! Base16 Solarized
+! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized)
 !
-! http://ethanschoonover.com/solarized
+!#define base00 #002b36
-
+!#define base01 #073642
-
+!#define base02 #586e75
-! Common
+!#define base03 #657b83
-
+!#define base04 #839496
-#define S_yellow        #b58900
+!#define base05 #93a1a1
-#define S_orange        #cb4b16
+!#define base06 #eee8d5
-#define S_red           #dc322f
+!#define base07 #fdf6e3
-#define S_magenta       #d33682
+!#define base08 #dc322f
-#define S_violet        #6c71c4
+!#define base09 #cb4b16
-#define S_blue          #268bd2
+!#define base0A #b58900
-#define S_cyan          #2aa198
+!#define base0B #859900
-#define S_green         #859900
+!#define base0C #2aa198
-
+!#define base0D #268bd2
-
+!#define base0E #6c71c4
-! Dark
+!#define base0F #d33682
-
-#define S_base03        #002b36
-#define S_base02        #073642
-#define S_base01        #586e75
-#define S_base00        #657b83
-#define S_base0         #839496
-#define S_base1         #93a1a1
-#define S_base2         #eee8d5
-#define S_base3         #fdf6e3
-
-
-! Light
-
-! #define S_base03        #fdf6e3
-! #define S_base02        #eee8d5
-! #define S_base01        #93a1a1
-! #define S_base00        #839496
-! #define S_base0         #657b83
-! #define S_base1         #586e75
-! #define S_base2         #073642
-! #define S_base3         #002b36
-
-
-! To only apply colors to your terminal, for example, prefix
-! the color assignment statement with its name. Example:
 !
-! URxvt*background:            S_base03
+!*.foreground:   base02
-
+!*.background:   base07
-*background:              S_base03
+!*.cursorColor:  base02
-*foreground:              S_base0
+!
-*fading:                  40
+!*.color0:       base00
-*fadeColor:               S_base03
+!*.color1:       base08
-*cursorColor:             S_base1
+!*.color2:       base0B
-*pointerColorBackground:  S_base01
+!*.color3:       base0A
-*pointerColorForeground:  S_base1
+!*.color4:       base0D
-
+!*.color5:       base0E
-*color0:                  S_base02
+!*.color6:       base0C
-*color1:                  S_red
+!*.color7:       base05
-*color2:                  S_green
+!
-*color3:                  S_yellow
+!*.color8:       base03
-*color4:                  S_blue
+!*.color9:       base08
-*color5:                  S_magenta
+!*.color10:      base0B
-*color6:                  S_cyan
+!*.color11:      base0A
-*color7:                  S_base2
+!*.color12:      base0D
-*color9:                  S_orange
+!*.color13:      base0E
-*color8:                  S_base03
+!*.color14:      base0C
-*color10:                 S_base01
+!*.color15:      base07
-*color11:                 S_base00
+!
-*color12:                 S_base0
+! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt),
-*color13:                 S_violet
+! use 'shell' template to set these if necessary
-*color14:                 S_base1
+!*.color16:      base09
-*color15:                 S_base3
+!*.color17:      base0F
+!*.color18:      base01
+!*.color19:      base02
+!*.color20:      base04
+!*.color21:      base06

vimrc

@@ -38,7 +38,7 @@ Plugin 'airblade/vim-gitgutter'
 Plugin 'mileszs/ack.vim'
 
 Plugin 'vim-airline', {'name': 'airline'}
-Plugin 'altercation/vim-colors-solarized'
+Plugin 'chriskempson/base16-vim'
 
 Plugin 'scrooloose/syntastic.git'
 Plugin 'Townk/vim-autoclose'
@@ -119,7 +119,8 @@ set cursorline
 
 syntax enable
 set background=dark
-colorscheme solarized
+let base16colorspace=256
+colorscheme base16-solarized
 
 set scrolloff=3
 
@@ -234,7 +235,7 @@ let g:syntastic_javascript_checkers = ['jscs','jshint']
 let g:syntastic_check_on_open = 1
 
 "" ariline
-let g:airline_theme = 'solarized'
+let g:airline_theme = 'powerlineish'
 let g:airline_enable_syntastic = 1
 let g:airline#extensions#tabline#enabled = 1
 

zshenv

@@ -15,6 +15,11 @@ export NVM_DIR="$HOME/.nvm"
 # todo.sh
 alias t=todo.sh
 
+# Base16 Shell
+BASE16_SCHEME="solarized"
+BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
+[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
+
 # BW specific stuff
 JIRA_URL="https://jira.brandwatch.com"