Commits

José Antonio Pérez Sánchez  committed 0fd78ef Merge

Merge branch 'master' of ssh://bitbucket.org/zundr/castle-zundr-dotfiles

  • Participants
  • Parent commits a532b49, 0379dd0

Comments (0)

Files changed (16)

File home/.gitconfig

 	email = jose.a.perez.sanchez@gmail.com
 [core]
 	editor = vim
+[alias]
+  st = status
+  co = checkout
+  ci = commit
+  br = branch
+  df = diff
+  lp = log -p
+  com = checkout master
+  fe = fetch origin
+  hr = reset origin/master --hard
+  me = config user.name
+  bn = !git for-each-ref --format='%(refname:short)' refs/heads/master
+  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+  today = !git all --since='12am' --committer=\"`git me`\"
+  today-all = !git all --since='12am'
+  sync = !git update && git co master && git pull && git co @{-1}
+  resync = !sh -c 'BRANCH_NAME=master && git com && git fe && git hr && git rebase master '
 dlog = log --style ~/.hgstyle.dlog --pager yes
 nlog = log --style ~/.hgstyle.nlog --pager yes
 sglog = log --style ~/.hgstyle.sglog --pager yes
-sync = !(echo Incoming...; $HG in -b. --style ~/.$HGstyle.slog && $HG pull -b. --rebase); (echo Outgoing...; $HG out -b. && $HG push -r.)
+sync = !(echo Incoming...; $HG in -b. && $HG pull -b. --rebase); (echo Outgoing...; $HG out -b. && $HG push -r.)
 last-integration = log -r 'last(children(branch("$1")) and branch(integration), $2)'
 last-merge-of = log -r 'last(children(branch("$1")) and branch("$2"), $3)'
 changes = log -r '$1::. and branch("$2") and not merge()'
+# Customize to your needs...
+export PATH=$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin
+
 # Path to your oh-my-zsh configuration.
 ZSH=$HOME/.oh-my-zsh
 ZSH_CUSTOM=$HOME/.zsh
 # Uncomment following line if you want red dots to be displayed while waiting for completion
 COMPLETION_WAITING_DOTS="true"
 
+# tmux plugin config+
+ZSH_TMUX_AUTOSTART=true
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git mercurial perl python battery ant ssh-agent history-substring-search rvm per-directory-history)
+plugins=(git mercurial perl python battery ant ssh-agent history-substring-search rvm per-directory-history tmux)
 case $(uname) in
   Darwin)
     plugins=($plugins osx brew iterm2 )
   export SSH_AUTH_SOCK=/tmp/ssh-agent-$USER-screen
 fi
 
-# Customize to your needs...
-export PATH=$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin
-
 # Color listing
 eval $(dircolors ~/.dircolors)
 zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
     ;;
 esac
 
-# if not running under tmux, try to attach tmux session, if any
-if [ -z "$TMUX" -a -n "$DISPLAY" ]; then
-  if (tmux has-session 2>/dev/null); then
-    exec tmux attach-session
-  else
-    echo "Starting new TMUX session..."
-    exec env TERM=screen-256color-bce tmux new
-  fi
-fi
+## if not running under tmux, try to attach tmux session, if any
+#if [ -z "$TMUX" -a -n "$DISPLAY" ]; then
+  #if (tmux has-session 2>/dev/null); then
+    #exec tmux attach-session
+  #else
+    #echo "Starting new TMUX session..."
+    #exec env TERM=screen-256color-bce tmux new
+  #fi
+#fi
 
 ## Keybindings (vi!)
 bindkey -v

File home/bin/remove-old-kernels

+#!/bin/sh
+dpkg -l 'linux-*' | sed '/^ii/!d;/'"$(uname -r | sed "s/\(.*\)-\([^0-9]\+\)/\1/")"'/d;s/^[^ ]* [^ ]* \([^ ]*\).*/\1/;/[0-9]/!d' | xargs sudo apt-get -y purge

File home/bin/upgrade-powerline

 #!/bin/sh
-pip install --upgrade git+git://github.com/Lokaltog/powerline.git
-(cd ~/bin && cp -su ~/apps/python/bin/* .)
+#user=Lokaltog
+user=zhaocai
+pip install --upgrade git+git://github.com/$user/powerline.git
+if [ -d ~/apps/python/bin ]; then
+  (cd ~/bin && cp -su ~/apps/python/bin/* .)
+fi

File home/config/powerline/colors.json

 		"lightyellow": [7, "eee8d5"],
 		"oldlace": [15, "fdf6e3"],
 
-		"green": [2, "719e07"],
-		"cyan": [6, "2aa198"],
-		"blue": [4, "268bd2"],
-		"red": [1, "dc322f"],
-		"magenta": [5, "d33682"],
-		"violet": [13, "6c71c4"],
-		"orange": [9, "cb4b16"],
-		"yellow": [3, "b58900"],
+		"solarized.base03": [8, "002b36"],
+		"solarized.base02": [0, "073642"],
+		"solarized.base01": [10, "586e75"],
+		"solarized.base00": [11, "657b83"],
+		"solarized.base0": [12, "839496"],
+		"solarized.base1": [14, "93a1a1"],
+		"solarized.base2": [7, "eee8d5"],
+		"solarized.base3": [15, "fdf6e3"],
+		"solarized.yellow": [3, "b58900"],
+		"solarized.orange": [9, "cb4b16"],
+		"solarized.red": [1, "dc322f"],
+		"solarized.magenta": [5, "d33682"],
+		"solarized.violet": [13, "6c71c4"],
+		"solarized.blue": [4, "268bd2"],
+		"solarized.cyan": [6, "2aa198"],
+		"solarized.green": [2, "859900"],
+
 
 		"lightyellowgreen": 106,
 		"gold3": 178,
 		"khaki1": 228
 	},
 	"gradients": {
+		"dark_GREEN_Orange_red": [
+			[22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 94, 94, 94, 94, 94, 94, 94, 52],
+			["005f00", "015f00", "025f00", "035f00", "045f00", "055f00", "065f00", "075f00", "085f00", "095f00", "0b5f00", "0c5f00", "0d5f00", "0e5f00", "0f5f00", "105f00", "115f00", "125f00", "135f00", "145f00", "165f00", "175f00", "185f00", "195f00", "1a5f00", "1b5f00", "1c5f00", "1d5f00", "1e5f00", "1f5f00", "215f00", "225f00", "235f00", "245f00", "255f00", "265f00", "275f00", "285f00", "295f00", "2a5f00", "2c5f00", "2d5f00", "2e5f00", "2f5f00", "305f00", "315f00", "325f00", "335f00", "345f00", "355f00", "375f00", "385f00", "395f00", "3a5f00", "3b5f00", "3c5f00", "3d5f00", "3e5f00", "3f5f00", "415f00", "425f00", "435f00", "445f00", "455f00", "465f00", "475f00", "485f00", "495f00", "4a5f00", "4c5f00", "4d5f00", "4e5f00", "4f5f00", "505f00", "515f00", "525f00", "535f00", "545f00", "555f00", "575f00", "585f00", "595f00", "5a5f00", "5b5f00", "5c5f00", "5d5f00", "5e5f00", "615f00", "655f00", "685f00", "6c5f00", "6f5f00", "735f00", "765f00", "7a5f00", "7d5f00", "815f00", "845f00", "815200", "702900"]
+		],
+		"GREEN_Orange_red": [
+			[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1],
+			["005f00", "015f00", "025f00", "035f00", "045f00", "055f00", "065f00", "075f00", "085f00", "095f00", "0b5f00", "0c5f00", "0d5f00", "0e5f00", "0f5f00", "105f00", "115f00", "125f00", "135f00", "145f00", "165f00", "175f00", "185f00", "195f00", "1a5f00", "1b5f00", "1c5f00", "1d5f00", "1e5f00", "1f5f00", "215f00", "225f00", "235f00", "245f00", "255f00", "265f00", "275f00", "285f00", "295f00", "2a5f00", "2c5f00", "2d5f00", "2e5f00", "2f5f00", "305f00", "315f00", "325f00", "335f00", "345f00", "355f00", "375f00", "385f00", "395f00", "3a5f00", "3b5f00", "3c5f00", "3d5f00", "3e5f00", "3f5f00", "415f00", "425f00", "435f00", "445f00", "455f00", "465f00", "475f00", "485f00", "495f00", "4a5f00", "4c5f00", "4d5f00", "4e5f00", "4f5f00", "505f00", "515f00", "525f00", "535f00", "545f00", "555f00", "575f00", "585f00", "595f00", "5a5f00", "5b5f00", "5c5f00", "5d5f00", "5e5f00", "615f00", "655f00", "685f00", "6c5f00", "6f5f00", "735f00", "765f00", "7a5f00", "7d5f00", "815f00", "845f00", "815200", "702900"]
+		],
 		"green_yellow_red": [
 			[190, 184, 178, 172, 166, 160],
 			["8ae71c", "8ce71c", "8fe71c", "92e71c", "95e71d", "98e71d", "9ae71d", "9de71d", "a0e71e", "a3e71e", "a6e71e", "a8e71e", "abe71f", "aee71f", "b1e71f", "b4e71f", "b6e720", "b9e720", "bce720", "bfe720", "c2e821", "c3e721", "c5e621", "c7e521", "c9e522", "cbe422", "cde322", "cfe222", "d1e223", "d3e123", "d5e023", "d7df23", "d9df24", "dbde24", "dddd24", "dfdc24", "e1dc25", "e3db25", "e5da25", "e7d925", "e9d926", "e9d626", "e9d426", "e9d126", "e9cf27", "e9cc27", "e9ca27", "e9c727", "e9c528", "e9c228", "e9c028", "e9bd28", "e9bb29", "e9b829", "e9b629", "e9b329", "e9b12a", "e9ae2a", "e9ac2a", "e9a92a", "eaa72b", "eaa42b", "eaa22b", "ea9f2b", "ea9d2c", "ea9b2c", "ea982c", "ea962c", "ea942d", "ea912d", "ea8f2d", "ea8d2d", "ea8a2e", "ea882e", "ea862e", "ea832e", "ea812f", "ea7f2f", "ea7c2f", "ea7a2f", "eb7830", "eb7530", "eb7330", "eb7130", "eb6f31", "eb6c31", "eb6a31", "eb6831", "eb6632", "eb6332", "eb6132", "eb5f32", "eb5d33", "eb5a33", "eb5833", "eb5633", "eb5434", "eb5134", "eb4f34", "eb4d34", "ec4b35"]

File home/config/powerline/colorschemes/shell/solarized.json

 {
 	"name": "Solarized Dark",
 	"groups": {
-		"user":               { "fg": "oldlace", "bg": "blue", "attr": ["bold"] },
-		"superuser":          { "fg": "oldlace", "bg": "red", "attr": ["bold"] },
-		"virtualenv":         { "fg": "oldlace", "bg": "green" },
-		"branch":             { "fg": "gray61", "bg": "royalblue5" },
-		"branch_dirty":       { "fg": "yellow", "bg": "royalblue5" },
-		"branch_clean":       { "fg": "gray61", "bg": "royalblue5" },
-		"cwd":                { "fg": "lightyellow", "bg": "darkgreencopper" },
-		"cwd:current_folder": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
-		"cwd:divider":        { "fg": "gray61", "bg": "darkgreencopper" },
-		"hostname":           { "fg": "oldlace", "bg": "darkgreencopper" },
-		"exit_fail":          { "fg": "oldlace", "bg": "red" },
-		"exit_success":       { "fg": "oldlace", "bg": "green" }
+		"user":               { "fg": "solarized.base3", "bg": "solarized.blue", "attr": ["bold"] },
+		"superuser":          { "fg": "solarized.base3", "bg": "solarized.red", "attr": ["bold"] },
+		"virtualenv":         { "fg": "solarized.base3", "bg": "solarized.green" },
+		"branch":             { "fg": "solarized.base1", "bg": "solarized.base02" },
+		"branch_dirty":       { "fg": "solarized.yellow", "bg": "solarized.base02" },
+		"branch_clean":       { "fg": "solarized.base1", "bg": "solarized.base02" },
+		"cwd":                { "fg": "solarized.base2", "bg": "solarized.base01" },
+		"cwd:current_folder": { "fg": "solarized.base3", "bg": "solarized.base01", "attr": ["bold"] },
+		"cwd:divider":        { "fg": "solarized.base1", "bg": "solarized.base01" },
+		"hostname":           { "fg": "solarized.base3", "bg": "solarized.base01" },
+		"exit_fail":          { "fg": "solarized.base3", "bg": "solarized.red" },
+		"exit_success":       { "fg": "solarized.base3", "bg": "solarized.green" }
 	}
 }

File home/config/powerline/colorschemes/vim/default.json

 {
 	"name": "Default color scheme",
 	"groups": {
-		"background": { "fg": "white", "bg": "gray2" },
-		"background:divider": { "fg": "gray6", "bg": "gray2" },
-		"mode": { "fg": "darkestgreen", "bg": "brightgreen", "attr": ["bold"] },
-		"modified_indicator": { "fg": "brightyellow", "bg": "gray4", "attr": ["bold"] },
-		"paste_indicator": { "fg": "white", "bg": "mediumorange", "attr": ["bold"] },
-		"readonly_indicator": { "fg": "brightestred", "bg": "gray4" },
-		"branch": { "fg": "gray9", "bg": "gray4" },
-		"branch_dirty": { "fg": "brightyellow", "bg": "gray4" },
-		"branch_clean": { "fg": "gray9", "bg": "gray4" },
-		"branch:divider": { "fg": "gray7", "bg": "gray4" },
-		"file_directory": { "fg": "gray9", "bg": "gray4" },
-		"file_name": { "fg": "white", "bg": "gray4", "attr": ["bold"] },
-		"file_size": { "fg": "gray8", "bg": "gray2" },
-		"file_name_no_file": { "fg": "gray9", "bg": "gray4", "attr": ["bold"] },
-		"file_name_empty": { "fg": "gray9", "bg": "gray4" },
-		"file_format": { "fg": "gray8", "bg": "gray2" },
-		"file_encoding": { "fg": "gray8", "bg": "gray2" },
-		"file_type": { "fg": "gray8", "bg": "gray2" },
-		"file_vcs_status": { "fg": "brightestred", "bg": "gray4" },
-		"file_vcs_status_M": { "fg": "brightyellow", "bg": "gray4" },
-		"file_vcs_status_A": { "fg": "brightgreen", "bg": "gray4" },
-		"line_percent": { "fg": "gray9", "bg": "gray4" },
-		"line_percent_gradient": { "fg": "green_yellow_red", "bg": "gray4" },
-		"line_current": { "fg": "gray1", "bg": "gray10", "attr": ["bold"] },
-		"line_current_symbol": { "fg": "gray1", "bg": "gray10" },
-		"col_current": { "fg": "gray6", "bg": "gray10" },
-		"modified_buffers": { "fg": "brightyellow", "bg": "gray2" }
+                "background":               { "fg": "white", "bg": "gray2" },
+                "background:divider":       { "fg": "gray6", "bg": "gray2" },
+                "mode":                     { "fg": "darkestgreen", "bg": "brightgreen", "attr": ["bold"] },
+                "modified_indicator":       { "fg": "brightyellow", "bg": "gray4", "attr": ["bold"] },
+                "paste_indicator":          { "fg": "white", "bg": "mediumorange", "attr": ["bold"] },
+                "readonly_indicator":       { "fg": "brightestred", "bg": "gray4" },
+                "branch":                   { "fg": "gray9", "bg": "gray4" },
+                "branch_dirty":             { "fg": "brightyellow", "bg": "gray4" },
+                "branch_clean":             { "fg": "gray9", "bg": "gray4" },
+                "branch:divider":           { "fg": "gray7", "bg": "gray4" },
+                "file_directory":           { "fg": "gray9", "bg": "gray4" },
+                "weather":                  { "fg": "gray8", "bg": "gray1" },
+                "weather_temp_gradient":    { "fg": "blue_red", "bg": "gray1" },
+                "weather_condition_hot":    { "fg": "khaki1", "bg": "gray1" },
+                "weather_condition_snowy":  { "fg": "skyblue1", "bg": "gray1" },
+                "weather_condition_rainy":  { "fg": "skyblue1", "bg": "gray1" },
+                "file_name":                { "fg": "white", "bg": "gray4", "attr": ["bold"] },
+                "file_size":                { "fg": "gray8", "bg": "gray2" },
+                "file_name_no_file":        { "fg": "gray9", "bg": "gray4", "attr": ["bold"] },
+                "file_name_empty":          { "fg": "gray9", "bg": "gray4" },
+                "file_format":              { "fg": "gray8", "bg": "gray2" },
+                "file_encoding":            { "fg": "gray8", "bg": "gray2" },
+                "file_type":                { "fg": "gray8", "bg": "gray2" },
+                "file_vcs_status":          { "fg": "brightestred", "bg": "gray4" },
+                "file_vcs_status_M":        { "fg": "brightyellow", "bg": "gray4" },
+                "file_vcs_status_A":        { "fg": "brightgreen", "bg": "gray4" },
+                "line_percent":             { "fg": "gray9", "bg": "gray4" },
+                "line_percent_gradient":    { "fg": "green_yellow_red", "bg": "gray4" },
+                "line_current":             { "fg": "gray1", "bg": "gray10", "attr": ["bold"] },
+                "line_current_symbol":      { "fg": "gray1", "bg": "gray10" },
+                "virtcol_current_gradient": { "fg": "dark_GREEN_Orange_red", "bg": "gray10" },
+                "col_current":              { "fg": "gray6", "bg": "gray10" },
+                "modified_buffers":         { "fg": "brightyellow", "bg": "gray2" },
+                "explore":                  { "fg": "oldlace", "bg": "darkestblue" },
+                "syntastic":                { "fg": "brightestred", "bg": "gray2", "attr": ["bold"] },
+                "ruby_version":             { "fg": "brightyellow", "bg": "gray2", "attr": ["underline"] },
+                "tagbar_currenttag":        { "fg": "gray7", "bg": "gray2" },
+                "tagbar_sort_indicator":    { "fg": "brightgreen", "bg": "darkestblue" },
+                "tagbar_currentfile":       { "fg": "white", "bg": "darkestblue", "attr": ["bold"] },
+                "asynccommand":             { "fg": "brightyellow", "bg": "gray2" },
+                "tagbar_statusline":        { "fg": "oldlace", "bg": "darkestblue" },
+                "previewwindow":            { "fg": "white", "bg": "darkorange" },
+                "vimfiler":                 { "fg": "oldlace", "bg": "darkestblue" },
+                "unite":                    { "fg": "brightyellow", "bg": "gray2" },
+                "vimshell":                 { "fg": "brightyellow", "bg": "gray2" }
 	},
 	"mode_translations": {
 		"nc": {
 			"colors": {
 				"brightyellow": "darkorange",
-				"brightestred": "darkred",
+				"darkorange": "darkgreen",
+				"darkestblue": "darkestcyan",
+				"brightestred": "mediumred",
 				"gray0": "gray0",
 				"gray1": "gray0",
 				"gray2": "gray0",
 				"gray3": "gray1",
 				"gray4": "gray1",
 				"gray5": "gray1",
-				"gray6": "gray1",
+				"gray6": "white",
 				"gray7": "gray4",
 				"gray8": "gray4",
 				"gray9": "gray4",
 				"gray10": "gray5",
-				"white": "gray6",
+				"oldlace": "lightyellow",
 				"green_yellow_red": "gray5"
 			}
 		},
 				"green_yellow_red": "gray5"
 			},
 			"groups": {
-				"mode": { "fg": "darkestcyan", "bg": "white", "attr": ["bold"] },
-				"background:divider": { "fg": "darkcyan", "bg": "darkestblue" },
-				"branch:divider": { "fg": "darkcyan", "bg": "darkblue" }
+				"mode":                  { "fg": "darkestcyan", "bg": "white", "attr": ["bold"] },
+				"line_percent":          { "fg": "darkcyan", "bg": "darkestblue" },
+				"line_percent_gradient": { "fg": "green_yellow_red", "bg": "darkestblue" },
+				"background:divider":    { "fg": "darkcyan", "bg": "darkestblue" },
+				"branch:divider":        { "fg": "darkcyan", "bg": "darkblue" },
+				"ruby_version":          { "fg": "white", "bg": "darkestblue", "attr": ["underline"] },
+				"syntastic":             { "fg": "white", "bg": "darkestblue", "attr": ["bold"] },
+				"asynccommand":          { "fg": "brightyellow", "bg": "darkestblue", "attr": ["bold"] },
+				"tagbar_currenttag":     { "fg": "white", "bg": "darkestblue", "attr": ["bold"] }
 			}
 		},
 		"v": {

File home/config/powerline/colorschemes/vim/solarized.json

 {
 	"name": "Solarized Dark",
 	"groups": {
-		"background":             { "fg": "oldlace", "bg": "royalblue5" },
-		"background:divider":     { "fg": "lightskyblue4", "bg": "royalblue5" },
-		"mode":                   { "fg": "oldlace", "bg": "green", "attr": ["bold"] },
-		"modified_indicator":     { "fg": "yellow", "bg": "darkgreencopper", "attr": ["bold"] },
-		"paste_indicator":        { "fg": "oldlace", "bg": "orange", "attr": ["bold"] },
-		"readonly_indicator":     { "fg": "red", "bg": "darkgreencopper" },
-		"branch":                 { "fg": "lightyellow", "bg": "darkgreencopper" },
-		"branch_dirty":           { "fg": "yellow", "bg": "darkgreencopper" },
-		"branch_clean":           { "fg": "lightyellow", "bg": "darkgreencopper" },
-		"branch:divider":         { "fg": "gray61", "bg": "darkgreencopper" },
-		"file_directory":         { "fg": "lightyellow", "bg": "darkgreencopper" },
-		"file_name":              { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
-		"file_size":              { "fg": "oldlace", "bg": "darkgreencopper" },
-		"file_name_no_file":      { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
-		"file_name_empty":        { "fg": "oldlace", "bg": "darkgreencopper" },
-		"file_format":            { "fg": "gray61", "bg": "royalblue5" },
-		"file_encoding":          { "fg": "gray61", "bg": "royalblue5" },
-		"file_type":              { "fg": "gray61", "bg": "royalblue5" },
-		"file_vcs_status":        { "fg": "red", "bg": "darkgreencopper" },
-		"file_vcs_status_M":      { "fg": "yellow", "bg": "darkgreencopper" },
-		"file_vcs_status_A":      { "fg": "green", "bg": "darkgreencopper" },
-		"line_percent":           { "fg": "oldlace", "bg": "lightskyblue4" },
-		"line_percent_gradient":  { "fg": "green_yellow_orange_red", "bg": "lightskyblue4" },
-		"line_current":           { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] },
-		"line_current_symbol":    { "fg": "gray13", "bg": "lightyellow" },
-		"col_current":            { "fg": "azure4", "bg": "lightyellow" }
+		"background":            { "fg": "solarized.base3"       , "bg": "solarized.base02" } , 
+		"background:divider":    { "fg": "solarized.base00"      , "bg": "solarized.base02" } , 
+		"mode":                  { "fg": "solarized.base3"       , "bg": "solarized.green"    , "attr": ["bold"] } , 
+		"modified_indicator":    { "fg": "solarized.yellow"      , "bg": "solarized.base01"   , "attr": ["bold"] } , 
+		"paste_indicator":       { "fg": "solarized.base3"       , "bg": "solarized.orange"   , "attr": ["bold"] } , 
+		"readonly_indicator":    { "fg": "solarized.red"         , "bg": "solarized.base01" } , 
+		"branch":                { "fg": "solarized.base2"       , "bg": "solarized.base01" } , 
+		"branch_dirty":          { "fg": "solarized.yellow"      , "bg": "solarized.base01" } , 
+		"branch_clean":          { "fg": "solarized.base2"       , "bg": "solarized.base01" } , 
+		"branch:divider":        { "fg": "solarized.base1"       , "bg": "solarized.base01" } , 
+		"file_directory":        { "fg": "solarized.base2"       , "bg": "solarized.base01" } , 
+		"file_name":             { "fg": "solarized.base3"       , "bg": "solarized.base01"   , "attr": ["bold"] } , 
+		"file_size":             { "fg": "solarized.base3"       , "bg": "solarized.base01" } , 
+		"file_name_no_file":     { "fg": "solarized.base3"       , "bg": "solarized.base01"   , "attr": ["bold"] } , 
+		"file_name_empty":       { "fg": "solarized.base3"       , "bg": "solarized.base01" } , 
+		"file_format":           { "fg": "solarized.base1"       , "bg": "solarized.base02" } , 
+		"file_encoding":         { "fg": "solarized.base1"       , "bg": "solarized.base02" } , 
+		"file_type":             { "fg": "solarized.base1"       , "bg": "solarized.base02" } , 
+		"file_vcs_status":       { "fg": "solarized.red"         , "bg": "solarized.base01" } , 
+		"file_vcs_status_M":     { "fg": "solarized.yellow"      , "bg": "solarized.base01" } , 
+		"file_vcs_status_A":     { "fg": "solarized.green"       , "bg": "solarized.base01" } , 
+		"line_percent":          { "fg": "solarized.base3"       , "bg": "solarized.base00" } , 
+		"line_percent_gradient": { "fg": "dark_GREEN_Orange_red" , "bg": "solarized.base1" }  , 
+		"line_current":          { "fg": "solarized.base03"      , "bg": "solarized.base2"    , "attr": ["bold"] } , 
+		"line_current_symbol":   { "fg": "solarized.base03"      , "bg": "solarized.base2" }  , 
+		"col_current":           { "fg": "solarized.base0"       , "bg": "solarized.base2" }  , 
+		"ruby_version":          { "fg": "solarized.green"       , "bg": "solarized.base02"}  , 
+		"syntastic":             { "fg": "solarized.red"         , "bg": "solarized.base02"   , "attr": ["bold"] } , 
+		"tagbar_currenttag":     { "fg": "solarized.base1"       , "bg": "solarized.base02" } , 
+		"asynccommand":          { "fg": "solarized.magenta"     , "bg": "solarized.base02" } , 
+		"unite":                 { "fg": "solarized.base3"       , "bg": "solarized.violet" } , 
+		"vimshell":              { "fg": "solarized.base3"       , "bg": "solarized.base00" } , 
+		"vimfiler":              { "fg": "gray10"                , "bg": "solarized.orange" } , 
+		"tagbar_statusline":     { "fg": "gray10"                , "bg": "solarized.orange" } , 
+		"explore":               { "fg": "gray10"                , "bg": "solarized.orange" }
 	},
 	"mode_translations": {
 		"nc": {
 			"colors": {
-				"darkgreencopper": "royalblue5",
-				"lightskyblue4": "royalblue5",
-				"azure4": "darkgreencopper",
-				"gray61": "lightskyblue4",
-				"lightyellow": "azure4",
-				"oldlace": "gray61"
+				"solarized.base01" : "solarized.base02" , 
+				"solarized.base00" : "solarized.base02" , 
+				"solarized.base0"  : "solarized.base01" , 
+				"solarized.base1"  : "solarized.base00" , 
+				"solarized.base2"  : "solarized.base0"  , 
+				"solarized.base3"  : "solarized.base1"  , 
+				"gray10"           : "white"  , 
+				"solarized.orange" : "darkestblue"
 			}
 		},
 		"i": {
 			"groups": {
-				"background":             { "fg": "oldlace", "bg": "darkgreencopper" },
-				"background:divider":     { "fg": "lightyellow", "bg": "darkgreencopper" },
-				"mode":                   { "fg": "oldlace", "bg": "blue", "attr": ["bold"] },
-				"modified_indicator":     { "fg": "yellow", "bg": "lightyellow", "attr": ["bold"] },
-				"paste_indicator":        { "fg": "oldlace", "bg": "orange", "attr": ["bold"] },
-				"readonly_indicator":     { "fg": "red", "bg": "lightyellow" },
-				"branch":                 { "fg": "darkgreencopper", "bg": "lightyellow" },
-				"branch:divider":         { "fg": "lightskyblue4", "bg": "lightyellow" },
-				"file_directory":         { "fg": "darkgreencopper", "bg": "lightyellow" },
-				"file_name":              { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] },
-				"file_size":              { "fg": "royalblue5", "bg": "lightyellow" },
-				"file_name_no_file":      { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] },
-				"file_name_empty":        { "fg": "royalblue5", "bg": "lightyellow" },
-				"file_format":            { "fg": "lightyellow", "bg": "darkgreencopper" },
-				"file_encoding":          { "fg": "lightyellow", "bg": "darkgreencopper" },
-				"file_type":              { "fg": "lightyellow", "bg": "darkgreencopper" },
-				"file_vcs_status":        { "fg": "red", "bg": "lightyellow" },
-				"file_vcs_status_M":      { "fg": "yellow", "bg": "lightyellow" },
-				"file_vcs_status_A":      { "fg": "green", "bg": "lightyellow" },
-				"line_percent":           { "fg": "oldlace", "bg": "gray61" },
-				"line_percent_gradient":  { "fg": "oldlace", "bg": "gray61" },
-				"line_current":           { "fg": "gray13", "bg": "oldlace", "attr": ["bold"] },
-				"line_current_symbol":    { "fg": "gray13", "bg": "oldlace" },
-				"col_current":            { "fg": "azure4", "bg": "oldlace" }
+				"background":             { "fg": "solarized.base3"   , "bg": "solarized.base01" } , 
+				"background:divider":     { "fg": "solarized.base2"   , "bg": "solarized.base01" } , 
+				"mode":                   { "fg": "solarized.base3"   , "bg": "solarized.blue"     , "attr": ["bold"] } , 
+				"modified_indicator":     { "fg": "solarized.yellow"  , "bg": "solarized.base2"    , "attr": ["bold"] } , 
+				"paste_indicator":        { "fg": "solarized.base3"   , "bg": "solarized.orange"   , "attr": ["bold"] } , 
+				"readonly_indicator":     { "fg": "solarized.red"     , "bg": "solarized.base2" }  , 
+				"branch":                 { "fg": "solarized.base01"  , "bg": "solarized.base2" }  , 
+				"branch:divider":         { "fg": "solarized.base00"  , "bg": "solarized.base2" }  , 
+				"file_directory":         { "fg": "solarized.base01"  , "bg": "solarized.base2" }  , 
+				"file_name":              { "fg": "solarized.base02"  , "bg": "solarized.base2"    , "attr": ["bold"] } , 
+				"file_size":              { "fg": "solarized.base02"  , "bg": "solarized.base2" }  , 
+				"file_name_no_file":      { "fg": "solarized.base02"  , "bg": "solarized.base2"    , "attr": ["bold"] } , 
+				"file_name_empty":        { "fg": "solarized.base02"  , "bg": "solarized.base2" }  , 
+				"file_format":            { "fg": "solarized.base2"   , "bg": "solarized.base01" } , 
+				"file_encoding":          { "fg": "solarized.base2"   , "bg": "solarized.base01" } , 
+				"file_type":              { "fg": "solarized.base2"   , "bg": "solarized.base01" } , 
+				"file_vcs_status":        { "fg": "solarized.red"     , "bg": "solarized.base2" }  , 
+				"file_vcs_status_M":      { "fg": "solarized.yellow"  , "bg": "solarized.base2" }  , 
+				"file_vcs_status_A":      { "fg": "solarized.green"   , "bg": "solarized.base2" }  , 
+				"line_percent":           { "fg": "solarized.base3"   , "bg": "solarized.base1" }  , 
+				"line_percent_gradient":  { "fg": "solarized.base3"   , "bg": "solarized.base1" }  , 
+				"line_current":           { "fg": "solarized.base03"  , "bg": "solarized.base3"    , "attr": ["bold"] } , 
+				"line_current_symbol":    { "fg": "solarized.base03"  , "bg": "solarized.base3" }  , 
+				"col_current":            { "fg": "solarized.base0"   , "bg": "solarized.base3" }  , 
+				"tagbar_currenttag":      { "fg": "solarized.base3"   , "bg": "solarized.base1" }  , 
+				"ruby_version":           { "fg": "solarized.base02"  , "bg": "solarized.base1" }   , 
+				"asynccommand":           { "fg": "solarized.magenta" , "bg": "solarized.base1" }  , 
+				"syntastic":              { "fg": "solarized.base1"   , "bg": "solarized.base1" }
 			}
 		},
 		"v": {
 			"groups": {
-				"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+				"mode": { "fg": "solarized.base3", "bg": "solarized.orange", "attr": ["bold"] }
 			}
 		},
 		"V": {
 			"groups": {
-				"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+				"mode": { "fg": "solarized.base3", "bg": "solarized.orange", "attr": ["bold"] }
 			}
 		},
 		"^V": {
 			"groups": {
-				"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+				"mode": { "fg": "solarized.base3", "bg": "solarized.orange", "attr": ["bold"] }
 			}
 		},
 		"R": {
 			"groups": {
-				"mode": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }
+				"mode": { "fg": "solarized.base3", "bg": "solarized.red", "attr": ["bold"] }
 			}
 		}
 	}
 }
+

File home/config/powerline/config.json

 			"theme": "default"
 		},
 		"vim": {
-			"colorscheme": "default",
+			"colorscheme": "solarized",
 			"theme": "default",
 			"local_themes": {
 				"cmdwin": "cmdwin",
-				"help": "help"
+				"help": "help",
+				"linepower.matchers.previewwindow": "previewwindow",
+				"linepower.matchers.unite": "unite",
+				"linepower.matchers.tagbar": "tagbar",
+				"linepower.matchers.vimfiler": "vimfiler" ,
+				"linepower.matchers.vimshell": "vimshell" ,
+				"quickfix": "quickfix"
 			}
 		},
 		"wm": {

File home/config/powerline/themes/ipython/in.json

 			{
 				"type": "string",
 				"contents": "In[",
-				"draw_divider": false,
+				"draw_soft_divider": false,
 				"highlight_group": ["prompt"]
 			},
 			{
 				"name": "prompt_count",
 				"module": "powerline.segments.ipython",
-				"draw_divider": false
+				"draw_soft_divider": false
 			},
 			{
 				"type": "string",

File home/config/powerline/themes/ipython/out.json

 			{
 				"type": "string",
 				"contents": "Out[",
-				"draw_divider": false,
+				"draw_soft_divider": false,
 				"width": "auto",
 				"align": "r",
 				"highlight_group": ["prompt"]
 			{
 				"name": "prompt_count",
 				"module": "powerline.segments.ipython",
-				"draw_divider": false
+				"draw_soft_divider": false
 			},
 			{
 				"type": "string",

File home/config/powerline/themes/ipython/rewrite.json

 			{
 				"type": "string",
 				"contents": "",
-				"draw_divider": false,
+				"draw_soft_divider": false,
 				"width": "auto",
 				"highlight_group": ["prompt"]
 			},
 			{
 				"name": "prompt_count",
 				"module": "powerline.segments.ipython",
-				"draw_divider": false
+				"draw_soft_divider": false
 			},
 			{
 				"type": "string",

File home/config/powerline/themes/vim/cmdwin.json

 			{
 				"type": "string",
 				"highlight_group": ["background"],
-				"draw_divider": false,
+				"draw_soft_divider": false,
+				"draw_hard_divider": false,
 				"width": "auto"
 			}
 		]

File home/config/powerline/themes/vim/default.json

 {
 	"segment_data": {
+		"mode": {
+			"args": {
+				"override": {
+					"n" : "N",
+					"v" : "V",
+					"i" : "I",
+					"R" : "R",
+					"!" : "!"
+				}
+			}
+		},
 		"branch": {
 			"before": " "
 		},
 			"args": { "gradient": true },
 			"after": "%"
 		},
+		"rvm_current": {
+			"args": { "only_ruby": true }
+		},
+		"file_directory": {
+			"args": {
+				"shorten_user": true, 
+				"shorten_cwd": true, 
+				"shorten_home": true 
+			}
+		},
 		"line_current_symbol": {
 			"contents": " "
 		}
 			{
 				"name": "branch",
 				"exclude_modes": ["nc"],
-				"priority": 60
+				"priority": 30
 			},
 			{
 				"name": "readonly_indicator",
-				"draw_divider": false,
+				"draw_soft_divider": false,
 				"after": " "
 			},
 			{
 				"name": "file_directory",
 				"priority": 40,
-				"draw_divider": false
+				"draw_soft_divider": false 
 			},
 			{
 				"name": "file_name",
-				"draw_divider": false
+				"draw_soft_divider": false
 			},
 			{
 				"name": "file_vcs_status",
 				"before": " ",
-				"draw_divider": false
+				"draw_soft_divider": false
 			},
 			{
 				"name": "modified_indicator",
-				"before": " "
+				"before": " ",
+				"draw_soft_divider": true
+			},
+			{
+				"module" : "linepower.segments",
+				"name": "tagbar_currenttag",
+				"exclude_modes": ["nc"],
+				"draw_hard_divider": false,
+				"draw_soft_divider": false
+			},
+			{
+				"module" : "linepower.segments",
+				"name": "asynccommand",
+				"exclude_modes": ["nc"],
+				"draw_hard_divider": false,
+				"draw_soft_divider": false
+			},
+			{
+				"module" : "linepower.segments",
+				"name": "syntastic",
+				"exclude_modes": ["nc"],
+				"draw_hard_divider": false,
+				"draw_soft_divider": false
 			},
 			{
 				"type": "string",
 				"highlight_group": ["background"],
-				"draw_divider": false,
+				"draw_soft_divider": false,
+				"draw_hard_divider": false,
 				"width": "auto"
 			}
 		],
 		"right": [
 			{
 				"name": "file_format",
-				"draw_divider": false,
+				"draw_soft_divider": false,
 				"exclude_modes": ["nc"],
-				"priority": 50
+				"priority": 60
 			},
 			{
 				"name": "file_encoding",
 				"exclude_modes": ["nc"],
-				"priority": 50
+				"priority": 60
 			},
 			{
 				"name": "file_type",
 				"exclude_modes": ["nc"],
+				"priority": 60
+			},
+			{
+				"module" : "linepower.segments",
+				"name": "rvm_current",
+				"draw_soft_divider": true,
+				"draw_hard_divider": true,
+				"exclude_modes": ["nc"],
 				"priority": 50
 			},
 			{
 				"name": "line_percent",
-				"priority": 30,
+				"priority": 50,
 				"width": 4,
 				"align": "r"
 			},
 			},
 			{
 				"name": "line_current",
-				"draw_divider": false,
+				"draw_soft_divider": false,
 				"width": 3,
 				"align": "r"
 			},
 			{
 				"name": "virtcol_current",
-				"draw_divider": false,
-				"priority": 30,
+				"draw_soft_divider": false,
+				"priority": 20,
 				"before": ":",
 				"width": 3,
 				"align": "l"

File home/config/powerline/themes/vim/help.json

 		"left": [
 			{
 				"name": "file_name",
-				"draw_divider": false
+				"draw_soft_divider": false
 			},
 			{
 				"type": "string",
 				"highlight_group": ["background"],
-				"draw_divider": false,
+				"draw_soft_divider": false,
+				"draw_hard_divider": false,
 				"width": "auto"
 			}
 		],
 			},
 			{
 				"name": "line_current",
-				"draw_divider": false,
+				"draw_soft_divider": false,
 				"width": 3,
 				"align": "r"
 			}