Merge branch 'master' of github.com:aarongut/dotfiles

.tmux.conf

@@ -4,6 +4,10 @@ set-option -g mouse on
 set -g mode-keys vi
 set -g history-limit 10000
 
+# configure TERM
+set -g default-terminal 'tmux-256color'
+set -as terminal-overrides ',xterm*:Tc:sitm=\E[3m'
+
 # y and p
 bind Escape copy-mode
 unbind p

.vim/colors/materialbox.vim

@@ -134,6 +134,11 @@ let s:gb.faded_purple   = ['#6a1b9a', 96]      " 143-63-113
 let s:gb.faded_aqua     = ['#303F9F', 66]      " 66-123-88
 let s:gb.faded_orange   = ['#E65100', 130]     " 175-58-3
 
+let s:gb.dark_red	= ['#522828', 52] 	" 82-40-40
+let s:gb.dark_green	= ['#1e5221', 22] 	" 30-82-33
+let s:gb.dark_yellow	= ['#66602f', 58] 	" 102-96-47
+let s:gb.dark_blue 	= ['#07203d', 17] 	" 7-32-61
+
 " }}}
 " Setup Emphasis: {{{
 
@@ -618,14 +623,11 @@ endif
 " }}}
 " Diffs: {{{
 
-call s:HL('DiffDelete', s:red, s:bg0, s:inverse)
-call s:HL('DiffAdd',    s:green, s:bg0, s:inverse)
-"call s:HL('DiffChange', s:bg0, s:blue)
-"call s:HL('DiffText',   s:bg0, s:yellow)
-
-" Alternative setting
-call s:HL('DiffChange', s:aqua, s:bg0, s:inverse)
-call s:HL('DiffText',   s:yellow, s:bg0, s:inverse)
+" Changes background, not foreground for better symbol highlighting
+call s:HL('DiffDelete', s:none, s:gb.dark_red)
+call s:HL('DiffAdd',    s:none, s:gb.dark_green)
+call s:HL('DiffChange', s:none, s:gb.dark_blue)
+call s:HL('DiffText',   s:none, s:gb.dark_yellow, s:bold)
 
 " }}}
 " Spelling: {{{

.zshrc

@@ -15,7 +15,7 @@ export CLICOLOR=1
 export MAIL=/var/spool/mail/amgutier
 
 export LSCOLORS=DxGxcxdxCxegedabagacad
-export TERM=xterm-256color #256 color support
+export TERM=xterm-256color-italic
 export LESSOPEN='|/usr/local/bin/lesspipe.sh %s'
 export LESS_ADVANCED_PREPROCESSOR=1
 

install

@@ -11,4 +11,7 @@ cd .vim/bundle/vimproc.vim
 make
 cd ../../..
 
-rsync --exclude ".git/" --exclude ".git*" --exclude "install" --exclude "py3status" --exclude "bin/" -avhE  --no-perms . ~;
+tic -x profiles/xterm-256color-italic.terminfo
+tic -x profiles/tmux-256color.terminfo
+
+rsync --exclude ".git/" --exclude ".git*" --exclude "install" --exclude "profiles" --exclude "py3status" --exclude "bin/" -avhE  --no-perms . ~;

profiles/tmux-256color.terminfo

@@ -0,0 +1,4 @@
+tmux-256color|tmux with 256 colors,
+  ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m, Ms@,
+  khome=\E[1~, kend=\E[4~,
+  use=xterm-256color, use=screen-256color,

profiles/xterm-256color-italic.terminfo

@@ -0,0 +1,3 @@
+xterm-256color-italic|xterm with 256 colors and italic,
+  sitm=\E[3m, ritm=\E[23m,
+  use=xterm-256color,