Update submodules, remove unnecessary files

Emptied out more unused powerline config files, removed emacs config (because
we're probably never really going to learn it).

.gitmodules

@@ -11,5 +11,5 @@
   path = powerline/rainbarf
   url = https://github.com/creaktive/rainbarf.git
 [submodule "tmux/rainbarf"]
-	path = tmux/rainbarf
-	url = https://github.com/creaktive/rainbarf.git
+  path = tmux/rainbarf
+  url = https://github.com/creaktive/rainbarf.git

emacs/emacs

@@ -1,46 +0,0 @@
-(package-initialize)
-
-
-;;; Repositories
-
-;; MELPA. For more plugin goodness, particularly evil-mode.
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/") t)
-
-(when (< emacs-major-version 24)
-  (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/") ))
-
-
-;;; Setup
-
-;; Vim-bindings with Evil-Mode
-(setq evil-want-C-u-scroll t) ; <C-u> for "up" to match <C-d> for "down"
-
-(require 'evil-leader)
-(global-evil-leader-mode)
-(evil-leader/set-leader ",")
-(evil-leader/set-key
-  "e" 'find-file
-  "b" 'switch-to-buffer
-  "k" 'kill-buffer
-  "d" 'dired)
-
-(require 'evil)
-(evil-mode 1)
-
-
-;; Mouse support for Terminal Emulators. Particularly iTerm2. With mouse wheel scrolling.
-(unless window-system
-  (require 'mouse)
-  (xterm-mouse-mode t)
-  (global-set-key [mouse-4] '(lambda ()
-                              (interactive)
-                              (scroll-down 1)))
-  (global-set-key [mouse-5] '(lambda ()
-                              (interactive)
-                              (scroll-up 1)))
-  (defun track-mouse (e))
-  (setq mouse-sel-mode t))
-
-
-;; Solarized: How do we set this up properly?

powerline/config/colors.json

@@ -3,6 +3,7 @@
 		"black": 16,
 		"white": 231,
 
+		"green": 2,
 		"darkestgreen": 22,
 		"darkgreen": 28,
 		"mediumgreen": 70,
@@ -32,6 +33,7 @@
 		"brightorange": 208,
 		"brightestorange": 214,
 
+		"yellow": 11,
 		"brightyellow": 220,
 
 		"gray0": 233,
@@ -46,6 +48,11 @@
 		"gray9": 250,
 		"gray10": 252,
 
+		"gray11": 234,
+		"gray90": 254,
+
+		"gray70": [249, "b3b3b3"],
+
 		"lightyellowgreen": 106,
 		"gold3": 178,
 		"orangered": 202,

powerline/config/colorschemes/default.json

@@ -1,44 +1,51 @@
 {
 	"name": "Default",
 	"groups": {
-		"background:divider":        { "fg": "gray5", "bg": "gray0", "attr": [] },
-		"session":                   { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"date":                      { "fg": "gray8", "bg": "gray2", "attr": [] },
-		"time":                      { "fg": "gray10", "bg": "gray2", "attr": ["bold"] },
-		"time:divider":              { "fg": "gray5", "bg": "gray2", "attr": [] },
-		"email_alert":               { "fg": "white", "bg": "brightred", "attr": ["bold"] },
-		"email_alert_gradient":      { "fg": "white", "bg": "yellow_orange_red", "attr": ["bold"] },
-		"hostname":                  { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"weather":                   { "fg": "gray8", "bg": "gray0", "attr": [] },
-		"weather_temp_gradient":     { "fg": "blue_red", "bg": "gray0", "attr": [] },
-		"weather_condition_hot":     { "fg": "khaki1", "bg": "gray0", "attr": [] },
-		"weather_condition_snowy":   { "fg": "skyblue1", "bg": "gray0", "attr": [] },
-		"weather_condition_rainy":   { "fg": "skyblue1", "bg": "gray0", "attr": [] },
-		"uptime":                    { "fg": "gray8", "bg": "gray0", "attr": [] },
-		"external_ip":               { "fg": "gray8", "bg": "gray0", "attr": [] },
-		"internal_ip":               { "fg": "gray8", "bg": "gray0", "attr": [] },
-		"network_load":              { "fg": "gray8", "bg": "gray0", "attr": [] },
-		"network_load_gradient":     { "fg": "green_yellow_orange_red", "bg": "gray0", "attr": [] },
-		"system_load":               { "fg": "gray8", "bg": "gray0", "attr": [] },
-		"system_load_gradient":      { "fg": "green_yellow_orange_red", "bg": "gray0", "attr": [] },
-		"environment":               { "fg": "gray8", "bg": "gray0", "attr": [] },
-		"cpu_load_percent":          { "fg": "gray8", "bg": "gray0", "attr": [] },
-		"cpu_load_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0", "attr": [] },
-		"battery":                   { "fg": "gray8", "bg": "gray0", "attr": [] },
-		"battery_gradient":          { "fg": "white_red", "bg": "gray0", "attr": [] },
-		"battery_full":              { "fg": "red", "bg": "gray0", "attr": [] },
-		"battery_empty":             { "fg": "white", "bg": "gray0", "attr": [] },
-		"now_playing":               { "fg": "gray10", "bg": "black", "attr": [] },
-		"user":                      { "fg": "white", "bg": "darkblue", "attr": ["bold"] },
-		"superuser":                 { "fg": "white", "bg": "brightred", "attr": ["bold"] },
-		"branch":                    { "fg": "gray9", "bg": "gray2", "attr": [] },
-		"branch_dirty":              { "fg": "brightyellow", "bg": "gray2", "attr": [] },
-		"branch_clean":              { "fg": "gray9", "bg": "gray2", "attr": [] },
-		"branch:divider":            { "fg": "gray7", "bg": "gray2", "attr": [] },
-		"cwd":                       { "fg": "gray9", "bg": "gray4", "attr": [] },
-		"cwd:current_folder":        { "fg": "gray10", "bg": "gray4", "attr": ["bold"] },
-		"cwd:divider":               { "fg": "gray7", "bg": "gray4", "attr": [] },
-		"virtualenv":                { "fg": "white", "bg": "darkcyan", "attr": [] },
-		"attached_clients":          { "fg": "gray8", "bg": "gray0", "attr": [] }
+		"information:additional":    { "fg": "gray9", "bg": "gray4", "attrs": [] },
+		"information:regular":       { "fg": "gray10", "bg": "gray4", "attrs": ["bold"] },
+		"information:highlighted":   { "fg": "white", "bg": "gray4", "attrs": [] },
+		"information:priority":      { "fg": "brightyellow", "bg": "mediumorange", "attrs": [] },
+		"warning:regular":           { "fg": "white", "bg": "brightred", "attrs": ["bold"] },
+		"critical:failure":          { "fg": "white", "bg": "darkestred", "attrs": [] },
+		"critical:success":          { "fg": "white", "bg": "darkestgreen", "attrs": [] },
+		"background":                { "fg": "white", "bg": "gray0", "attrs": [] },
+		"background:divider":        { "fg": "gray5", "bg": "gray0", "attrs": [] },
+		"session":                   { "fg": "black", "bg": "gray10", "attrs": ["bold"] },
+		"date":                      { "fg": "gray8", "bg": "gray2", "attrs": [] },
+		"time":                      { "fg": "gray10", "bg": "gray2", "attrs": ["bold"] },
+		"time:divider":              { "fg": "gray5", "bg": "gray2", "attrs": [] },
+		"email_alert":               "warning:regular",
+		"email_alert_gradient":      { "fg": "white", "bg": "yellow_orange_red", "attrs": ["bold"] },
+		"hostname":                  { "fg": "black", "bg": "gray10", "attrs": ["bold"] },
+		"weather":                   { "fg": "gray8", "bg": "gray0", "attrs": [] },
+		"weather_temp_gradient":     { "fg": "blue_red", "bg": "gray0", "attrs": [] },
+		"weather_condition_hot":     { "fg": "khaki1", "bg": "gray0", "attrs": [] },
+		"weather_condition_snowy":   { "fg": "skyblue1", "bg": "gray0", "attrs": [] },
+		"weather_condition_rainy":   { "fg": "skyblue1", "bg": "gray0", "attrs": [] },
+		"uptime":                    { "fg": "gray8", "bg": "gray0", "attrs": [] },
+		"external_ip":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
+		"internal_ip":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
+		"network_load":              { "fg": "gray8", "bg": "gray0", "attrs": [] },
+		"network_load_gradient":     { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
+		"system_load":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
+		"system_load_gradient":      { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
+		"environment":               { "fg": "gray8", "bg": "gray0", "attrs": [] },
+		"cpu_load_percent":          { "fg": "gray8", "bg": "gray0", "attrs": [] },
+		"cpu_load_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0", "attrs": [] },
+		"battery":                   { "fg": "gray8", "bg": "gray0", "attrs": [] },
+		"battery_gradient":          { "fg": "white_red", "bg": "gray0", "attrs": [] },
+		"battery_full":              { "fg": "red", "bg": "gray0", "attrs": [] },
+		"battery_empty":             { "fg": "white", "bg": "gray0", "attrs": [] },
+		"player":                    { "fg": "gray10", "bg": "black", "attrs": [] },
+		"user":                      { "fg": "white", "bg": "darkblue", "attrs": ["bold"] },
+		"branch":                    { "fg": "gray9", "bg": "gray2", "attrs": [] },
+		"branch_dirty":              { "fg": "brightyellow", "bg": "gray2", "attrs": [] },
+		"branch_clean":              { "fg": "gray9", "bg": "gray2", "attrs": [] },
+		"branch:divider":            { "fg": "gray7", "bg": "gray2", "attrs": [] },
+		"cwd":                       "information:additional",
+		"cwd:current_folder":        "information:regular",
+		"cwd:divider":               { "fg": "gray7", "bg": "gray4", "attrs": [] },
+		"virtualenv":                { "fg": "white", "bg": "darkcyan", "attrs": [] },
+		"attached_clients":          { "fg": "gray8", "bg": "gray0", "attrs": [] }
 	}
 }

powerline/config/colorschemes/ipython/default.json

@@ -1,7 +0,0 @@
-{
-	"name": "Default color scheme for IPython prompt",
-	"groups": {
-		"prompt":         { "fg": "gray9", "bg": "gray4", "attr": [] },
-		"prompt_count":   { "fg": "white", "bg": "gray4", "attr": [] }
-	}
-}

powerline/config/colorschemes/shell/__main__.json

@@ -1,6 +0,0 @@
-{
-	"groups": {
-		"continuation":         "cwd",
-		"continuation:current": "cwd:current_folder"
-	}
-}

powerline/config/colorschemes/shell/default.json

@@ -1,19 +0,0 @@
-{
-	"name": "Default color scheme for shell prompts",
-	"groups": {
-		"hostname":         { "fg": "brightyellow", "bg": "mediumorange", "attr": [] },
-		"jobnum":           { "fg": "brightyellow", "bg": "mediumorange", "attr": [] },
-		"exit_fail":        { "fg": "white", "bg": "darkestred", "attr": [] },
-		"exit_success":     { "fg": "white", "bg": "darkestgreen", "attr": [] },
-		"environment":      { "fg": "white", "bg": "darkestgreen", "attr": [] },
-		"mode":             { "fg": "darkestgreen", "bg": "brightgreen", "attr": ["bold"] },
-		"attached_clients": { "fg": "white", "bg": "darkestgreen", "attr": [] }
-	},
-	"mode_translations": {
-		"vicmd": {
-			"groups": {
-				"mode": {"fg": "darkestcyan", "bg": "white", "attr": ["bold"]}
-			}
-		}
-	}
-}

powerline/config/colorschemes/shell/solarized.json

@@ -1,16 +0,0 @@
-{
-	"name": "Solarized dark for shell",
-	"groups": {
-		"jobnum":             { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
-		"exit_fail":          { "fg": "solarized:base3", "bg": "solarized:red", "attr": [] },
-		"exit_success":       { "fg": "solarized:base3", "bg": "solarized:green", "attr": [] },
-		"mode":               { "fg": "solarized:base3", "bg": "solarized:green", "attr": ["bold"] }
-	},
-	"mode_translations": {
-		"vicmd": {
-			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:blue", "attr": ["bold"] }
-			}
-		}
-	}
-}

powerline/config/colorschemes/solarized.json

@@ -1,18 +1,35 @@
 {
 	"name": "Solarized dark",
 	"groups": {
-		"background":         { "fg": "solarized:base3", "bg": "solarized:base02", "attr": [] },
-		"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", "attr": [] },
-		"branch":             { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
-		"branch_dirty":       { "fg": "solarized:yellow", "bg": "solarized:base02", "attr": [] },
-		"branch_clean":       { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
-		"cwd":                { "fg": "solarized:base2", "bg": "solarized:base01", "attr": [] },
-		"cwd:current_folder": { "fg": "solarized:base3", "bg": "solarized:base01", "attr": ["bold"] },
-		"cwd:divider":        { "fg": "solarized:base1", "bg": "solarized:base01", "attr": [] },
-		"hostname":           { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
-		"environment":        { "fg": "solarized:base3", "bg": "solarized:green", "attr": [] },
-		"attached_clients":   { "fg": "solarized:base3", "bg": "solarized:green", "attr": [] }
+		"information:additional":  { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
+		"information:regular":     { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"] },
+		"information:highlighted": { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"]},
+		"information:priority":    { "fg": "solarized:base3", "bg": "solarized:yellow", "attrs": [] },
+		"warning:regular":         { "fg": "solarized:base3", "bg": "solarized:red", "attrs": [] },
+		"critical:failure":        { "fg": "solarized:base3", "bg": "solarized:red", "attrs": [] },
+		"critical:success":        { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
+		"background":              { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": [] },
+		"background:divider":      { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"user":                    { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] },
+		"virtualenv":              { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
+		"branch":                  { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"branch_dirty":            { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": [] },
+		"branch_clean":            { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"email_alert_gradient":    { "fg": "solarized:base3", "bg": "yellow_orange_red", "attrs": [] },
+		"email_alert":             "warning:regular",
+		"cwd":                     "information:additional",
+		"cwd:current_folder":      "information:regular",
+		"cwd:divider":             { "fg": "solarized:base1", "bg": "solarized:base01", "attrs": [] },
+		"network_load":            { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
+		"hostname":                { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
+		"environment":             { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
+		"attached_clients":        { "fg": "solarized:base3", "bg": "solarized:green", "attrs": [] },
+		"date":                    { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"time":                    { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": ["bold"] },
+		"time:divider":            { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"system_load":             { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
+		"weather_temp_gradient":   { "fg": "blue_red", "bg": "solarized:base03", "attrs": [] },
+		"weather":                 { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] },
+		"uptime":                  { "fg": "solarized:base1", "bg": "solarized:base03", "attrs": [] }
 	}
 }

powerline/config/colorschemes/tmux/default.json

@@ -1,27 +0,0 @@
-{
-	"name": "Default color scheme for terminal prompts",
-	"groups": {
-		"background:divider": { "fg": "gray5", "bg": "gray0" },
-		"session": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"date": { "fg": "gray8", "bg": "gray2" },
-		"time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] },
-		"time:divider": { "fg": "gray5", "bg": "gray2" },
-		"email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] },
-		"email_alert_gradient": { "fg": "white", "bg": "yellow_orange_red", "attr": ["bold"] },
-		"hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"weather": { "fg": "gray8", "bg": "gray0" },
-		"weather_temp_gradient": { "fg": "blue_red", "bg": "gray0" },
-		"weather_condition_hot": { "fg": "khaki1", "bg": "gray0" },
-		"weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" },
-		"weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" },
-		"uptime": { "fg": "gray8", "bg": "gray0" },
-		"external_ip": { "fg": "gray8", "bg": "gray0" },
-		"network_load": { "fg": "gray8", "bg": "gray0" },
-		"network_load_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" },
-		"system_load": { "fg": "gray8", "bg": "gray0" },
-		"system_load_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" },
-		"environment": { "fg": "gray8", "bg": "gray0" },
-		"battery": { "fg": "gray8", "bg": "gray0" },
-		"battery_gradient": { "fg": "white_red", "bg": "gray0" }
-	}
-}

powerline/config/colorschemes/vim/__main__.json

@@ -1,31 +1,41 @@
 {
 	"groups": {
-		"branch_clean":     "branch",
-		"environment":      "information:unimportant",
-		"file_size":        "information:unimportant",
-		"file_format":      "information:unimportant",
-		"file_encoding":    "file_format",
-		"file_type":        "file_format",
-		"branch":           "information:additional",
-		"file_scheme":      "file_name",
-		"file_directory":   "information:additional",
-		"file_name_empty":  "file_directory",
-		"line_percent":     "information:additional",
-		"line_count":       "line_current",
-		"position":         "information:additional",
-		"single_tab":       "line_current",
-		"many_tabs":        "line_current",
-		"bufnr":            "file_directory",
-		"winnr":            "information:unimportant",
-		"tabnr":            "file_directory",
+		"branch_clean":       "branch",
+		"environment":        "information:unimportant",
+		"file_size":          "information:unimportant",
+		"file_format":        "information:unimportant",
+		"file_encoding":      "file_format",
+		"file_type":          "file_format",
+		"branch":             "information:additional",
+		"file_scheme":        "file_name",
+		"file_directory":     "information:additional",
+		"file_name_empty":    "file_directory",
+		"line_percent":       "information:additional",
+		"line_count":         "line_current",
+		"position":           "information:additional",
+		"single_tab":         "line_current",
+		"many_tabs":          "line_current",
+		"bufnr":              "file_directory",
+		"winnr":              "information:unimportant",
+		"tabnr":              "file_directory",
+		"capslock_indicator": "paste_indicator",
 
-		"tab_nc:file_directory": "information:unimportant",
-		"tab_nc:file_name":      "tab_nc:file_directory",
-		"tab_nc:tabnr":          "tab_nc:file_directory",
+		"csv:column_number": "line_current",
+		"csv:column_name":   "line_current_symbol",
+
+		"tab_nc:modified_indicator": "modified_indicator",
+		"tab_nc:file_directory":     "information:unimportant",
+		"tab_nc:file_name":          "tab_nc:file_directory",
+		"tab_nc:tabnr":              "tab_nc:file_directory",
 
 		"buf_nc:file_directory":     "tab_nc:file_directory",
 		"buf_nc:file_name":          "tab_nc:file_name",
 		"buf_nc:bufnr":              "tab_nc:tabnr",
-		"buf_nc:modified_indicator": "tab_nc:modified_indicator"
+		"buf_nc:modified_indicator": "tab_nc:modified_indicator",
+
+		"commandt:label":      "file_name",
+		"commandt:background": "background",
+		"commandt:finder":     "file_name",
+		"commandt:path":       "file_directory"
 	}
 }

powerline/config/colorschemes/vim/default.json

@@ -1,38 +1,38 @@
 {
 	"name": "Default color scheme",
 	"groups": {
-		"information:unimportant":  { "fg": "gray8", "bg": "gray2", "attr": [] },
-		"information:additional":   { "fg": "gray9", "bg": "gray4", "attr": [] },
-		"background":               { "fg": "white", "bg": "gray2", "attr": [] },
-		"background:divider":       { "fg": "gray6", "bg": "gray2", "attr": [] },
-		"mode":                     { "fg": "darkestgreen", "bg": "brightgreen", "attr": ["bold"] },
-		"visual_range":             { "fg": "brightestorange", "bg": "darkorange", "attr": ["bold"] },
-		"modified_indicator":       { "fg": "brightyellow", "bg": "gray4", "attr": ["bold"] },
-		"paste_indicator":          { "fg": "white", "bg": "mediumorange", "attr": ["bold"] },
-		"readonly_indicator":       { "fg": "brightestred", "bg": "gray4", "attr": [] },
-		"branch_dirty":             { "fg": "brightyellow", "bg": "gray4", "attr": [] },
-		"branch:divider":           { "fg": "gray7", "bg": "gray4", "attr": [] },
-		"file_name":                { "fg": "white", "bg": "gray4", "attr": ["bold"] },
-		"window_title":             { "fg": "white", "bg": "gray4", "attr": [] },
-		"file_name_no_file":        { "fg": "gray9", "bg": "gray4", "attr": ["bold"] },
-		"file_vcs_status":          { "fg": "brightestred", "bg": "gray4", "attr": [] },
-		"file_vcs_status_M":        { "fg": "brightyellow", "bg": "gray4", "attr": [] },
-		"file_vcs_status_A":        { "fg": "brightgreen", "bg": "gray4", "attr": [] },
-		"line_percent":             { "fg": "gray9", "bg": "gray4", "attr": [] },
-		"line_percent_gradient":    { "fg": "dark_green_gray", "bg": "gray4", "attr": [] },
-		"position":                 { "fg": "gray9", "bg": "gray4", "attr": [] },
-		"position_gradient":        { "fg": "green_yellow_red", "bg": "gray4", "attr": [] },
-		"line_current":             { "fg": "gray1", "bg": "gray10", "attr": ["bold"] },
-		"line_current_symbol":      { "fg": "gray1", "bg": "gray10", "attr": [] },
-		"virtcol_current_gradient": { "fg": "dark_GREEN_Orange_red", "bg": "gray10", "attr": [] },
-		"col_current":              { "fg": "gray6", "bg": "gray10", "attr": [] },
-		"modified_buffers":         { "fg": "brightyellow", "bg": "gray2", "attr": [] },
-		"attached_clients":         { "fg": "gray8", "bg": "gray2", "attr": [] },
-		"error":                    { "fg": "brightestred", "bg": "darkred", "attr": ["bold"] },
-		"warning":                  { "fg": "brightyellow", "bg": "darkorange", "attr": ["bold"] },
-		"current_tag":              { "fg": "gray9", "bg": "gray2", "attr": [] },
+		"information:unimportant":  { "fg": "gray8", "bg": "gray2", "attrs": [] },
+		"information:additional":   { "fg": "gray9", "bg": "gray4", "attrs": [] },
+		"background":               { "fg": "white", "bg": "gray2", "attrs": [] },
+		"background:divider":       { "fg": "gray6", "bg": "gray2", "attrs": [] },
+		"mode":                     { "fg": "darkestgreen", "bg": "brightgreen", "attrs": ["bold"] },
+		"visual_range":             { "fg": "brightestorange", "bg": "darkorange", "attrs": ["bold"] },
+		"modified_indicator":       { "fg": "brightyellow", "bg": "gray4", "attrs": ["bold"] },
+		"paste_indicator":          { "fg": "white", "bg": "mediumorange", "attrs": ["bold"] },
+		"readonly_indicator":       { "fg": "brightestred", "bg": "gray4", "attrs": [] },
+		"branch_dirty":             { "fg": "brightyellow", "bg": "gray4", "attrs": [] },
+		"branch:divider":           { "fg": "gray7", "bg": "gray4", "attrs": [] },
+		"file_name":                { "fg": "white", "bg": "gray4", "attrs": ["bold"] },
+		"window_title":             { "fg": "white", "bg": "gray4", "attrs": [] },
+		"file_name_no_file":        { "fg": "gray9", "bg": "gray4", "attrs": ["bold"] },
+		"file_vcs_status":          { "fg": "brightestred", "bg": "gray4", "attrs": [] },
+		"file_vcs_status_M":        { "fg": "brightyellow", "bg": "gray4", "attrs": [] },
+		"file_vcs_status_A":        { "fg": "brightgreen", "bg": "gray4", "attrs": [] },
+		"line_percent":             { "fg": "gray9", "bg": "gray4", "attrs": [] },
+		"line_percent_gradient":    { "fg": "dark_green_gray", "bg": "gray4", "attrs": [] },
+		"position":                 { "fg": "gray9", "bg": "gray4", "attrs": [] },
+		"position_gradient":        { "fg": "green_yellow_red", "bg": "gray4", "attrs": [] },
+		"line_current":             { "fg": "gray1", "bg": "gray10", "attrs": ["bold"] },
+		"line_current_symbol":      { "fg": "gray1", "bg": "gray10", "attrs": [] },
+		"virtcol_current_gradient": { "fg": "dark_GREEN_Orange_red", "bg": "gray10", "attrs": [] },
+		"col_current":              { "fg": "gray6", "bg": "gray10", "attrs": [] },
+		"modified_buffers":         { "fg": "brightyellow", "bg": "gray2", "attrs": [] },
+		"attached_clients":         { "fg": "gray8", "bg": "gray2", "attrs": [] },
+		"error":                    { "fg": "brightestred", "bg": "darkred", "attrs": ["bold"] },
+		"warning":                  { "fg": "brightyellow", "bg": "darkorange", "attrs": ["bold"] },
+		"current_tag":              { "fg": "gray9", "bg": "gray2", "attrs": [] },
 
-		"tab_nc:modified_indicator": { "fg": "brightyellow", "bg": "gray2", "attr": ["bold"] }
+		"tab_nc:modified_indicator": { "fg": "brightyellow", "bg": "gray2", "attrs": ["bold"] }
 	},
 	"mode_translations": {
 		"nc": {
@@ -71,29 +71,29 @@
 				"dark_green_gray": "light_green_gray"
 			},
 			"groups": {
-				"mode":               { "fg": "darkestcyan", "bg": "white", "attr": ["bold"] },
-				"background:divider": { "fg": "darkcyan", "bg": "darkestblue", "attr": [] },
-				"branch:divider":     { "fg": "darkcyan", "bg": "darkblue", "attr": [] }
+				"mode":               { "fg": "darkestcyan", "bg": "white", "attrs": ["bold"] },
+				"background:divider": { "fg": "darkcyan", "bg": "darkestblue", "attrs": [] },
+				"branch:divider":     { "fg": "darkcyan", "bg": "darkblue", "attrs": [] }
 			}
 		},
 		"v": {
 			"groups": {
-				"mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
+				"mode": { "fg": "darkorange", "bg": "brightestorange", "attrs": ["bold"] }
 			}
 		},
 		"V": {
 			"groups": {
-				"mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
+				"mode": { "fg": "darkorange", "bg": "brightestorange", "attrs": ["bold"] }
 			}
 		},
 		"^V": {
 			"groups": {
-				"mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
+				"mode": { "fg": "darkorange", "bg": "brightestorange", "attrs": ["bold"] }
 			}
 		},
 		"R": {
 			"groups": {
-				"mode": { "fg": "white", "bg": "brightred", "attr": ["bold"] }
+				"mode": { "fg": "white", "bg": "brightred", "attrs": ["bold"] }
 			}
 		}
 	}

powerline/config/colorschemes/vim/solarized.json

@@ -1,37 +1,37 @@
 {
 	"name": "Solarized dark for vim",
 	"groups": {
-		"information:additional":   { "fg": "solarized:base2", "bg": "solarized:base01", "attr": [] },
-		"information:unimportant":  { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
-		"background":               { "fg": "solarized:base3", "bg": "solarized:base02", "attr": [] },
-		"background:divider":       { "fg": "solarized:base00", "bg": "solarized:base02", "attr": [] },
-		"mode":                     { "fg": "solarized:base3", "bg": "solarized:green", "attr": ["bold"] },
-		"visual_range":             { "fg": "solarized:green", "bg": "solarized:base3", "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", "attr": [] },
-		"branch_dirty":             { "fg": "solarized:yellow", "bg": "solarized:base01", "attr": [] },
-		"branch:divider":           { "fg": "solarized:base1", "bg": "solarized:base01", "attr": [] },
-		"file_name":                { "fg": "solarized:base3", "bg": "solarized:base01", "attr": ["bold"] },
-		"window_title":             { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
-		"file_name_no_file":        { "fg": "solarized:base3", "bg": "solarized:base01", "attr": ["bold"] },
-		"file_format":              { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
-		"file_vcs_status":          { "fg": "solarized:red", "bg": "solarized:base01", "attr": [] },
-		"file_vcs_status_M":        { "fg": "solarized:yellow", "bg": "solarized:base01", "attr": [] },
-		"file_vcs_status_A":        { "fg": "solarized:green", "bg": "solarized:base01", "attr": [] },
-		"line_percent":             { "fg": "solarized:base3", "bg": "solarized:base00", "attr": [] },
-		"line_percent_gradient":    { "fg": "green_yellow_orange_red", "bg": "solarized:base00", "attr": [] },
-		"position":                 { "fg": "solarized:base3", "bg": "solarized:base00", "attr": [] },
-		"position_gradient":        { "fg": "green_yellow_orange_red", "bg": "solarized:base00", "attr": [] },
-		"line_current":             { "fg": "solarized:base03", "bg": "solarized:base2", "attr": ["bold"] },
-		"line_current_symbol":      { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
-		"virtcol_current_gradient": { "fg": "GREEN_Orange_red", "bg": "solarized:base2", "attr": [] },
-		"col_current":              { "fg": "solarized:base0", "bg": "solarized:base2", "attr": [] },
-		"environment":              { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
-		"attached_clients":         { "fg": "solarized:base1", "bg": "solarized:base02", "attr": [] },
-		"error":                    { "fg": "solarized:base3", "bg": "solarized:red", "attr": ["bold"] },
-		"warning":                  { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] },
-		"current_tag":              { "fg": "solarized:base3", "bg": "solarized:base02", "attr": ["bold"] }
+		"information:additional":   { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
+		"information:unimportant":  { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
+		"background":               { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": [] },
+		"background:divider":       { "fg": "solarized:base00", "bg": "solarized:base02", "attrs": [] },
+		"mode":                     { "fg": "solarized:base3", "bg": "solarized:green", "attrs": ["bold"] },
+		"visual_range":             { "fg": "solarized:green", "bg": "solarized:base3", "attrs": ["bold"] },
+		"modified_indicator":       { "fg": "solarized:yellow", "bg": "solarized:base01", "attrs": ["bold"] },
+		"paste_indicator":          { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] },
+		"readonly_indicator":       { "fg": "solarized:red", "bg": "solarized:base01", "attrs": [] },
+		"branch_dirty":             { "fg": "solarized:yellow", "bg": "solarized:base01", "attrs": [] },
+		"branch:divider":           { "fg": "solarized:base1", "bg": "solarized:base01", "attrs": [] },
+		"file_name":                { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"] },
+		"window_title":             { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
+		"file_name_no_file":        { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": ["bold"] },
+		"file_format":              { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"file_vcs_status":          { "fg": "solarized:red", "bg": "solarized:base01", "attrs": [] },
+		"file_vcs_status_M":        { "fg": "solarized:yellow", "bg": "solarized:base01", "attrs": [] },
+		"file_vcs_status_A":        { "fg": "solarized:green", "bg": "solarized:base01", "attrs": [] },
+		"line_percent":             { "fg": "solarized:base3", "bg": "solarized:base00", "attrs": [] },
+		"line_percent_gradient":    { "fg": "green_yellow_orange_red", "bg": "solarized:base00", "attrs": [] },
+		"position":                 { "fg": "solarized:base3", "bg": "solarized:base00", "attrs": [] },
+		"position_gradient":        { "fg": "green_yellow_orange_red", "bg": "solarized:base00", "attrs": [] },
+		"line_current":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": ["bold"] },
+		"line_current_symbol":      { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
+		"virtcol_current_gradient": { "fg": "GREEN_Orange_red", "bg": "solarized:base2", "attrs": [] },
+		"col_current":              { "fg": "solarized:base0", "bg": "solarized:base2", "attrs": [] },
+		"environment":              { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"attached_clients":         { "fg": "solarized:base1", "bg": "solarized:base02", "attrs": [] },
+		"error":                    { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] },
+		"warning":                  { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] },
+		"current_tag":              { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": ["bold"] }
 	},
 	"mode_translations": {
 		"nc": {
@@ -46,50 +46,50 @@
 		},
 		"i": {
 			"groups": {
-				"background":             { "fg": "solarized:base3", "bg": "solarized:base01", "attr": [] },
-				"background:divider":     { "fg": "solarized:base2", "bg": "solarized:base01", "attr": [] },
-				"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", "attr": [] },
-				"branch":                 { "fg": "solarized:base01", "bg": "solarized:base2", "attr": [] },
-				"branch:divider":         { "fg": "solarized:base00", "bg": "solarized:base2", "attr": [] },
-				"file_directory":         { "fg": "solarized:base01", "bg": "solarized:base2", "attr": [] },
-				"file_name":              { "fg": "solarized:base02", "bg": "solarized:base2", "attr": ["bold"] },
-				"file_size":              { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
-				"file_name_no_file":      { "fg": "solarized:base02", "bg": "solarized:base2", "attr": ["bold"] },
-				"file_name_empty":        { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
-				"file_format":            { "fg": "solarized:base2", "bg": "solarized:base01", "attr": [] },
-				"file_vcs_status":        { "fg": "solarized:red", "bg": "solarized:base2", "attr": [] },
-				"file_vcs_status_M":      { "fg": "solarized:yellow", "bg": "solarized:base2", "attr": [] },
-				"file_vcs_status_A":      { "fg": "solarized:green", "bg": "solarized:base2", "attr": [] },
-				"line_percent":           { "fg": "solarized:base3", "bg": "solarized:base1", "attr": [] },
-				"line_percent_gradient":  { "fg": "solarized:base3", "bg": "solarized:base1", "attr": [] },
-				"position":               { "fg": "solarized:base3", "bg": "solarized:base1", "attr": [] },
-				"position_gradient":      { "fg": "solarized:base3", "bg": "solarized:base1", "attr": [] },
-				"line_current":           { "fg": "solarized:base03", "bg": "solarized:base3", "attr": ["bold"] },
-				"line_current_symbol":    { "fg": "solarized:base03", "bg": "solarized:base3", "attr": [] },
-				"col_current":            { "fg": "solarized:base0", "bg": "solarized:base3", "attr": [] }
+				"background":             { "fg": "solarized:base3", "bg": "solarized:base01", "attrs": [] },
+				"background:divider":     { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
+				"mode":                   { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] },
+				"modified_indicator":     { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": ["bold"] },
+				"paste_indicator":        { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] },
+				"readonly_indicator":     { "fg": "solarized:red", "bg": "solarized:base2", "attrs": [] },
+				"branch":                 { "fg": "solarized:base01", "bg": "solarized:base2", "attrs": [] },
+				"branch:divider":         { "fg": "solarized:base00", "bg": "solarized:base2", "attrs": [] },
+				"file_directory":         { "fg": "solarized:base01", "bg": "solarized:base2", "attrs": [] },
+				"file_name":              { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": ["bold"] },
+				"file_size":              { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
+				"file_name_no_file":      { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": ["bold"] },
+				"file_name_empty":        { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
+				"file_format":            { "fg": "solarized:base2", "bg": "solarized:base01", "attrs": [] },
+				"file_vcs_status":        { "fg": "solarized:red", "bg": "solarized:base2", "attrs": [] },
+				"file_vcs_status_M":      { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": [] },
+				"file_vcs_status_A":      { "fg": "solarized:green", "bg": "solarized:base2", "attrs": [] },
+				"line_percent":           { "fg": "solarized:base3", "bg": "solarized:base1", "attrs": [] },
+				"line_percent_gradient":  { "fg": "solarized:base3", "bg": "solarized:base1", "attrs": [] },
+				"position":               { "fg": "solarized:base3", "bg": "solarized:base1", "attrs": [] },
+				"position_gradient":      { "fg": "solarized:base3", "bg": "solarized:base1", "attrs": [] },
+				"line_current":           { "fg": "solarized:base03", "bg": "solarized:base3", "attrs": ["bold"] },
+				"line_current_symbol":    { "fg": "solarized:base03", "bg": "solarized:base3", "attrs": [] },
+				"col_current":            { "fg": "solarized:base0", "bg": "solarized:base3", "attrs": [] }
 			}
 		},
 		"v": {
 			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
+				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
 			}
 		},
 		"V": {
 			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
+				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
 			}
 		},
 		"^V": {
 			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
+				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
 			}
 		},
 		"R": {
 			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attr": ["bold"] }
+				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] }
 			}
 		}
 	}

powerline/config/colorschemes/vim/solarizedlight.json

@@ -1,36 +1,36 @@
 {
 	"name": "Solarized light for vim",
 	"groups": {
-		"information:additional":   { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
-		"information:unimportant":  { "fg": "solarized:base1", "bg": "solarized:base01", "attr": [] },
-		"background":               { "fg": "solarized:base03", "bg": "solarized:base01", "attr": [] },
-		"background:divider":       { "fg": "solarized:base0", "bg": "solarized:base01", "attr": [] },
-		"mode":                     { "fg": "solarized:base3", "bg": "solarized:green", "attr": ["bold"] },
-		"visual_range":             { "fg": "solarized:green", "bg": "solarized:base3", "attr": ["bold"] },
-		"modified_indicator":       { "fg": "solarized:yellow", "bg": "solarized:base2", "attr": ["bold"] },
-		"paste_indicator":          { "fg": "solarized:red", "bg": "solarized:base2", "attr": ["bold"] },
-		"readonly_indicator":       { "fg": "solarized:red", "bg": "solarized:base2", "attr": [] },
-		"branch_dirty":             { "fg": "solarized:yellow", "bg": "solarized:base2", "attr": [] },
-		"branch:divider":           { "fg": "solarized:base1", "bg": "solarized:base2", "attr": [] },
-		"file_name":                { "fg": "solarized:base03", "bg": "solarized:base2", "attr": ["bold"] },
-		"window_title":             { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
-		"file_size":                { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
-		"file_name_no_file":        { "fg": "solarized:base03", "bg": "solarized:base2", "attr": ["bold"] },
-		"file_name_empty":          { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
-		"file_vcs_status":          { "fg": "solarized:red", "bg": "solarized:base2", "attr": [] },
-		"file_vcs_status_M":        { "fg": "solarized:yellow", "bg": "solarized:base2", "attr": [] },
-		"file_vcs_status_A":        { "fg": "solarized:green", "bg": "solarized:base2", "attr": [] },
-		"line_percent":             { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
-		"line_percent_gradient":    { "fg": "green_yellow_orange_red", "bg": "solarized:base2", "attr": [] },
-		"position":                 { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
-		"position_gradient":        { "fg": "green_yellow_orange_red", "bg": "solarized:base2", "attr": [] },
-		"line_current":             { "fg": "solarized:base3", "bg": "solarized:base02", "attr": ["bold"] },
-		"line_current_symbol":      { "fg": "solarized:base3", "bg": "solarized:base02", "attr": [] },
-		"virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "solarized:base02", "attr": [] },
-		"col_current":              { "fg": "solarized:base00", "bg": "solarized:base02", "attr": [] },
-		"error":                    { "fg": "solarized:base03", "bg": "solarized:red", "attr": ["bold"] },
-		"warning":                  { "fg": "solarized:base03", "bg": "solarized:base2", "attr": ["bold"] },
-		"current_tag":              { "fg": "solarized:base03", "bg": "solarized:base01", "attr": ["bold"] }
+		"information:additional":   { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
+		"information:unimportant":  { "fg": "solarized:base1", "bg": "solarized:base01", "attrs": [] },
+		"background":               { "fg": "solarized:base03", "bg": "solarized:base01", "attrs": [] },
+		"background:divider":       { "fg": "solarized:base0", "bg": "solarized:base01", "attrs": [] },
+		"mode":                     { "fg": "solarized:base3", "bg": "solarized:green", "attrs": ["bold"] },
+		"visual_range":             { "fg": "solarized:green", "bg": "solarized:base3", "attrs": ["bold"] },
+		"modified_indicator":       { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": ["bold"] },
+		"paste_indicator":          { "fg": "solarized:red", "bg": "solarized:base2", "attrs": ["bold"] },
+		"readonly_indicator":       { "fg": "solarized:red", "bg": "solarized:base2", "attrs": [] },
+		"branch_dirty":             { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": [] },
+		"branch:divider":           { "fg": "solarized:base1", "bg": "solarized:base2", "attrs": [] },
+		"file_name":                { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": ["bold"] },
+		"window_title":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
+		"file_size":                { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
+		"file_name_no_file":        { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": ["bold"] },
+		"file_name_empty":          { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
+		"file_vcs_status":          { "fg": "solarized:red", "bg": "solarized:base2", "attrs": [] },
+		"file_vcs_status_M":        { "fg": "solarized:yellow", "bg": "solarized:base2", "attrs": [] },
+		"file_vcs_status_A":        { "fg": "solarized:green", "bg": "solarized:base2", "attrs": [] },
+		"line_percent":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
+		"line_percent_gradient":    { "fg": "green_yellow_orange_red", "bg": "solarized:base2", "attrs": [] },
+		"position":                 { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
+		"position_gradient":        { "fg": "green_yellow_orange_red", "bg": "solarized:base2", "attrs": [] },
+		"line_current":             { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": ["bold"] },
+		"line_current_symbol":      { "fg": "solarized:base3", "bg": "solarized:base02", "attrs": [] },
+		"virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "solarized:base02", "attrs": [] },
+		"col_current":              { "fg": "solarized:base00", "bg": "solarized:base02", "attrs": [] },
+		"error":                    { "fg": "solarized:base03", "bg": "solarized:red", "attrs": ["bold"] },
+		"warning":                  { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": ["bold"] },
+		"current_tag":              { "fg": "solarized:base03", "bg": "solarized:base01", "attrs": ["bold"] }
 	},
 	"mode_translations": {
 		"nc": {
@@ -45,51 +45,51 @@
 		},
 		"i": {
 			"groups": {
-				"background":             { "fg": "solarized:base03", "bg": "solarized:base2", "attr": [] },
-				"background:divider":     { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
-				"mode":                   { "fg": "solarized:base3", "bg": "solarized:blue", "attr": ["bold"] },
-				"modified_indicator":     { "fg": "solarized:yellow", "bg": "solarized:base02", "attr": ["bold"] },
-				"paste_indicator":        { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] },
-				"readonly_indicator":     { "fg": "solarized:red", "bg": "solarized:base02", "attr": [] },
-				"branch":                 { "fg": "solarized:base2", "bg": "solarized:base02", "attr": [] },
-				"branch:divider":         { "fg": "solarized:base0", "bg": "solarized:base02", "attr": [] },
-				"file_directory":         { "fg": "solarized:base2", "bg": "solarized:base02", "attr": [] },
-				"file_name":              { "fg": "solarized:base01", "bg": "solarized:base02", "attr": ["bold"] },
-				"file_size":              { "fg": "solarized:base01", "bg": "solarized:base02", "attr": [] },
-				"file_name_no_file":      { "fg": "solarized:base01", "bg": "solarized:base02", "attr": ["bold"] },
-				"file_name_empty":        { "fg": "solarized:base01", "bg": "solarized:base02", "attr": [] },
-				"file_format":            { "fg": "solarized:base02", "bg": "solarized:base2", "attr": [] },
-				"file_vcs_status":        { "fg": "solarized:red", "bg": "solarized:base02", "attr": [] },
-				"file_vcs_status_M":      { "fg": "solarized:yellow", "bg": "solarized:base02", "attr": [] },
-				"file_vcs_status_A":      { "fg": "solarized:green", "bg": "solarized:base02", "attr": [] },
-				"line_percent":           { "fg": "solarized:base03", "bg": "solarized:base1", "attr": [] },
-				"line_percent_gradient":  { "fg": "solarized:base03", "bg": "solarized:base1", "attr": [] },
-				"position":               { "fg": "solarized:base03", "bg": "solarized:base1", "attr": [] },
-				"position_gradient":      { "fg": "solarized:base03", "bg": "solarized:base1", "attr": [] },
-				"line_current":           { "fg": "solarized:base3", "bg": "solarized:base03", "attr": ["bold"] },
-				"line_current_symbol":    { "fg": "solarized:base3", "bg": "solarized:base03", "attr": [] },
-				"virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "solarized:base03", "attr": [] },
-				"col_current":              { "fg": "solarized:base00", "bg": "solarized:base03", "attr": [] }
+				"background":             { "fg": "solarized:base03", "bg": "solarized:base2", "attrs": [] },
+				"background:divider":     { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
+				"mode":                   { "fg": "solarized:base3", "bg": "solarized:blue", "attrs": ["bold"] },
+				"modified_indicator":     { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": ["bold"] },
+				"paste_indicator":        { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] },
+				"readonly_indicator":     { "fg": "solarized:red", "bg": "solarized:base02", "attrs": [] },
+				"branch":                 { "fg": "solarized:base2", "bg": "solarized:base02", "attrs": [] },
+				"branch:divider":         { "fg": "solarized:base0", "bg": "solarized:base02", "attrs": [] },
+				"file_directory":         { "fg": "solarized:base2", "bg": "solarized:base02", "attrs": [] },
+				"file_name":              { "fg": "solarized:base01", "bg": "solarized:base02", "attrs": ["bold"] },
+				"file_size":              { "fg": "solarized:base01", "bg": "solarized:base02", "attrs": [] },
+				"file_name_no_file":      { "fg": "solarized:base01", "bg": "solarized:base02", "attrs": ["bold"] },
+				"file_name_empty":        { "fg": "solarized:base01", "bg": "solarized:base02", "attrs": [] },
+				"file_format":            { "fg": "solarized:base02", "bg": "solarized:base2", "attrs": [] },
+				"file_vcs_status":        { "fg": "solarized:red", "bg": "solarized:base02", "attrs": [] },
+				"file_vcs_status_M":      { "fg": "solarized:yellow", "bg": "solarized:base02", "attrs": [] },
+				"file_vcs_status_A":      { "fg": "solarized:green", "bg": "solarized:base02", "attrs": [] },
+				"line_percent":           { "fg": "solarized:base03", "bg": "solarized:base1", "attrs": [] },
+				"line_percent_gradient":  { "fg": "solarized:base03", "bg": "solarized:base1", "attrs": [] },
+				"position":               { "fg": "solarized:base03", "bg": "solarized:base1", "attrs": [] },
+				"position_gradient":      { "fg": "solarized:base03", "bg": "solarized:base1", "attrs": [] },
+				"line_current":           { "fg": "solarized:base3", "bg": "solarized:base03", "attrs": ["bold"] },
+				"line_current_symbol":    { "fg": "solarized:base3", "bg": "solarized:base03", "attrs": [] },
+				"virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "solarized:base03", "attrs": [] },
+				"col_current":              { "fg": "solarized:base00", "bg": "solarized:base03", "attrs": [] }
 			}
 		},
 		"v": {
 			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
+				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
 			}
 		},
 		"V": {
 			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
+				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
 			}
 		},
 		"^V": {
 			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
+				"mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attrs": ["bold"] }
 			}
 		},
 		"R": {
 			"groups": {
-				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attr": ["bold"] }
+				"mode": { "fg": "solarized:base3", "bg": "solarized:red", "attrs": ["bold"] }
 			}
 		}
 	}

powerline/config/colorschemes/wm/default.json

@@ -1,26 +0,0 @@
-{
-	"name": "Default color scheme for window managers",
-	"groups": {
-		"background:divider": { "fg": "gray5", "bg": "gray0" },
-		"session": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"date": { "fg": "gray8", "bg": "gray2" },
-		"time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] },
-		"time:divider": { "fg": "gray5", "bg": "gray2" },
-		"email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] },
-		"email_alert_gradient": { "fg": "white", "bg": "yellow_orange_red", "attr": ["bold"] },
-		"hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"weather": { "fg": "gray8", "bg": "gray0" },
-		"weather_temp_gradient": { "fg": "blue_red", "bg": "gray0" },
-		"weather_condition_hot": { "fg": "khaki1", "bg": "gray0" },
-		"weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" },
-		"weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" },
-		"uptime": { "fg": "gray8", "bg": "gray0" },
-		"external_ip": { "fg": "gray8", "bg": "gray0" },
-		"network_load": { "fg": "gray8", "bg": "gray0" },
-		"system_load": { "fg": "gray8", "bg": "gray0" },
-		"system_load_good": { "fg": "lightyellowgreen", "bg": "gray0" },
-		"system_load_bad": { "fg": "gold3", "bg": "gray0" },
-		"system_load_ugly": { "fg": "orangered", "bg": "gray0" },
-		"environment": { "fg": "gray8", "bg": "gray0" }
-	}
-}

powerline/config/config.json

@@ -12,6 +12,10 @@
 				"in2": "in2"
 			}
 		},
+		"pdb": {
+			"colorscheme": "default",
+			"theme": "default"
+		},
 		"shell": {
 			"colorscheme": "default",
 			"theme": "default",
@@ -35,7 +39,7 @@
 				"quickfix": "quickfix",
 
 				"powerline.matchers.vim.plugin.nerdtree.nerdtree": "plugin_nerdtree",
-				"powerline.matchers.vim.plugin.ctrlp.ctrlp": "plugin_ctrlp",
+				"powerline.matchers.vim.plugin.commandt.commandt": "plugin_commandt",
 				"powerline.matchers.vim.plugin.gundo.gundo": "plugin_gundo",
 				"powerline.matchers.vim.plugin.gundo.gundo_preview": "plugin_gundo-preview"
 			}

powerline/config/themes/ascii.json

@@ -20,6 +20,16 @@
 				"ellipsis": "..."
 			}
 		},
+		"player": {
+			"args": {
+				"state_symbols": {
+					"fallback": "",
+					"play":     ">",
+					"pause":    "~",
+					"stop":     "X"
+				}
+			}
+		},
 
 		"line_current_symbol": {
 			"contents": "LN "
@@ -29,41 +39,31 @@
 			"before": ""
 		},
 
-		"powerline.segments.common.network_load": {
+		"powerline.segments.common.net.network_load": {
 			"args": {
 				"recv_format": "DL {value:>8}",
 				"sent_format": "UL {value:>8}"
 			}
 		},
-		"powerline.segments.common.now_playing": {
-			"args": {
-				"state_symbols": {
-					"fallback": "",
-					"play":     ">",
-					"pause":    "~",
-					"stop":     "X"
-				}
-			}
+		"powerline.segments.common.net.hostname": {
+			"before": "H "
 		},
-		"powerline.segments.common.battery": {
+		"powerline.segments.common.bat.battery": {
 			"args": {
 				"full_heart": "O",
 				"empty_heart": "O"
 			}
 		},
-		"powerline.segments.common.uptime": {
+		"powerline.segments.common.sys.uptime": {
 			"before": "UP  "
 		},
-		"powerline.segments.common.email_imap_alert": {
+		"powerline.segments.common.mail.email_imap_alert": {
 			"before": "MAIL "
 		},
-		"powerline.segments.common.virtualenv": {
+		"powerline.segments.common.env.virtualenv": {
 			"before": "(e) "
 		},
-		"powerline.segments.common.hostname": {
-			"before": "H "
-		},
-		"powerline.segments.common.weather": {
+		"powerline.segments.common.wthr.weather": {
 			"args": {
 				"icons": {
 					"day":           "DAY",
@@ -82,7 +82,7 @@
 				"temp_format": "{temp:.0f} C"
 			}
 		},
-		"powerline.segments.common.fuzzy_time": {
+		"powerline.segments.common.time.fuzzy_time": {
 			"args": {
 				"unicode_text": false
 			}
@@ -100,15 +100,15 @@
 					"S":  "S-LINE",
 					"^S": "S-BLCK",
 					"i":  "INSERT",
-					"R":  "REPLACE",
-					"Rv": "V-RPLCE",
+					"R":  "RPLACE",
+					"Rv": "V-RPLC",
 					"c":  "COMMND",
-					"cv": "VIM EX",
-					"ce": "EX",
+					"cv": "VIM-EX",
+					"ce": "NRM-EX",
 					"r":  "PROMPT",
-					"rm": "MORE",
-					"r?": "CONFIRM",
-					"!":  "SHELL"
+					"rm": "-MORE-",
+					"r?": "CNFIRM",
+					"!":  "!SHELL"
 				}
 			}
 		},

powerline/config/themes/ipython/in.json

@@ -1,26 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"left": [
-			{
-				"function": "virtualenv",
-				"priority": 10
-			},
-			{
-				"type": "string",
-				"contents": "In [",
-				"draw_soft_divider": false,
-				"highlight_group": ["prompt"]
-			},
-			{
-				"function": "powerline.segments.ipython.prompt_count",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"contents": "]",
-				"highlight_group": ["prompt"]
-			}
-		]
-	}
-}

powerline/config/themes/ipython/in2.json

@@ -1,13 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "",
-				"width": "auto",
-				"highlight_group": ["prompt"]
-			}
-		]
-	}
-}

powerline/config/themes/ipython/out.json

@@ -1,24 +0,0 @@
-{
-	"default_module": "powerline.segments.ipython",
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "Out[",
-				"draw_soft_divider": false,
-				"width": "auto",
-				"align": "r",
-				"highlight_group": ["prompt"]
-			},
-			{
-				"function": "prompt_count",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"contents": "]",
-				"highlight_group": ["prompt"]
-			}
-		]
-	}
-}

powerline/config/themes/ipython/rewrite.json

@@ -1,23 +0,0 @@
-{
-	"default_module": "powerline.segments.ipython",
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "",
-				"draw_soft_divider": false,
-				"width": "auto",
-				"highlight_group": ["prompt"]
-			},
-			{
-				"function": "prompt_count",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"contents": ">",
-				"highlight_group": ["prompt"]
-			}
-		]
-	}
-}

powerline/config/themes/powerline.json

@@ -23,46 +23,46 @@
 		"line_current_symbol": {
 			"contents": " "
 		},
+		"player": {
+			"args": {
+				"state_symbols": {
+					"fallback": "♫",
+					"play":     "▶",
+					"pause":    "▮▮",
+					"stop":     "■"
+				}
+			}
+		},
 
 		"time": {
 			"before": "⌚ "
 		},
 
-		"powerline.segments.common.network_load": {
+		"powerline.segments.common.net.network_load": {
 			"args": {
 				"recv_format": "⬇ {value:>8}",
 				"sent_format": "⬆ {value:>8}"
 			}
 		},
-		"powerline.segments.common.now_playing": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "▶",
-					"pause":    "▮▮",
-					"stop":     "■"
-				}
-			}
+		"powerline.segments.common.net.hostname": {
+			"before": " "
 		},
-		"powerline.segments.common.battery": {
+		"powerline.segments.common.bat.battery": {
 			"args": {
 				"full_heart": "♥",
 				"empty_heart": "♥"
 			}
 		},
-		"powerline.segments.common.uptime": {
+		"powerline.segments.common.sys.uptime": {
 			"before": "⇑  "
 		},
-		"powerline.segments.common.email_imap_alert": {
+		"powerline.segments.common.mail.email_imap_alert": {
 			"before": "✉ "
 		},
-		"powerline.segments.common.virtualenv": {
+		"powerline.segments.common.env.virtualenv": {
 			"before": "ⓔ  "
 		},
-		"powerline.segments.common.hostname": {
-			"before": " "
-		},
-		"powerline.segments.common.weather": {
+		"powerline.segments.common.wthr.weather": {
 			"args": {
 				"icons": {
 					"day":           "〇",
@@ -80,7 +80,7 @@
 				}
 			}
 		},
-		"powerline.segments.common.fuzzy_time": {
+		"powerline.segments.common.time.fuzzy_time": {
 			"args": {
 				"unicode_text": true
 			}
@@ -98,15 +98,15 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
-					"R":  "REPLACE",
-					"Rv": "V·RPLCE",
+					"R":  "RPLACE",
+					"Rv": "V·RPLC",
 					"c":  "COMMND",
-					"cv": "VIM EX",
-					"ce": "EX",
+					"cv": "VIM·EX",
+					"ce": "NRM·EX",
 					"r":  "PROMPT",
-					"rm": "MORE",
-					"r?": "CONFIRM",
-					"!":  "SHELL"
+					"rm": "-MORE-",
+					"r?": "CNFIRM",
+					"!":  "!SHELL"
 				}
 			}
 		},

powerline/config/themes/powerline_unicode7.json

@@ -0,0 +1,146 @@
+{
+	"dividers": {
+		"left": {
+			"hard": " ",
+			"soft": " "
+		},
+		"right": {
+			"hard": " ",
+			"soft": " "
+		}
+	},
+	"spaces": 1,
+	"segment_data": {
+		"branch": {
+			"before": "🔀 "
+		},
+		"cwd": {
+			"args": {
+				"ellipsis": "⋯"
+			}
+		},
+
+		"line_current_symbol": {
+			"contents": " "
+		},
+		"player": {
+			"args": {
+				"state_symbols": {
+					"fallback": "♫",
+					"play":     "⏵",
+					"pause":    "⏸",
+					"stop":     "⏹"
+				}
+			}
+		},
+
+		"time": {
+			"before": "🕐 "
+		},
+
+		"powerline.segments.common.net.network_load": {
+			"args": {
+				"recv_format": "⬇ {value:>8}",
+				"sent_format": "⬆ {value:>8}"
+			}
+		},
+		"powerline.segments.common.net.hostname": {
+			"before": "🏠 "
+		},
+		"powerline.segments.common.bat.battery": {
+			"args": {
+				"full_heart": "💙",
+				"empty_heart": "💛"
+			}
+		},
+		"powerline.segments.common.sys.uptime": {
+			"before": "⇑ "
+		},
+		"powerline.segments.common.mail.email_imap_alert": {
+			"before": "✉ "
+		},
+		"powerline.segments.common.env.virtualenv": {
+			"before": "🐍 "
+		},
+		"powerline.segments.common.wthr.weather": {
+			"args": {
+				"icons": {
+					"tornado":                 "🌪",
+					"hurricane":               "🌀",
+					"showers":                 "☔",
+					"scattered_showers":       "☔",
+					"thunderstorms":           "🌩",
+					"isolated_thunderstorms":  "🌩",
+					"scattered_thunderstorms": "🌩",
+					"dust":                    "🌫",
+					"fog":                     "🌫",
+					"cold":                    "❄",
+					"partly_cloudy_day":       "🌤",
+					"mostly_cloudy_day":       "🌥",
+					"sun":                     "🌣",
+					"hot":                     "♨",
+					"day":                     "☀",
+					"blustery":                "⚑",
+					"rainy":                   "☂",
+					"cloudy":                  "☁",
+					"snowy":                   "☃",
+					"stormy":                  "☈",
+					"foggy":                   "🌁",
+					"sunny":                   "🌣",
+					"night":                   "☾",
+					"windy":                   "☴",
+					"not_available":           "�",
+					"unknown":                 "⚠"
+				}
+			}
+		},
+		"powerline.segments.common.time.fuzzy_time": {
+			"args": {
+				"unicode_text": true
+			}
+		},
+
+		"powerline.segments.vim.mode": {
+			"args": {
+				"override": {
+					"n":  "NORMAL",
+					"no": "N·OPER",
+					"v":  "VISUAL",
+					"V":  "V·LINE",
+					"^V": "V·BLCK",
+					"s":  "SELECT",
+					"S":  "S·LINE",
+					"^S": "S·BLCK",
+					"i":  "INSERT",
+					"R":  "RPLACE",
+					"Rv": "V·RPLC",
+					"c":  "COMMND",
+					"cv": "VIM·EX",
+					"ce": "NRM·EX",
+					"r":  "PROMPT",
+					"rm": "-MORE-",
+					"r?": "CNFIRM",
+					"!":  "!SHELL"
+				}
+			}
+		},
+		"powerline.segments.vim.visual_range": {
+			"args": {
+				"CTRL_V_text": "{rows} × {vcols}",
+				"v_text_oneline": "C:{vcols}",
+				"v_text_multiline": "L:{rows}",
+				"V_text": "L:{rows}"
+			}
+		},
+		"powerline.segments.vim.readonly_indicator": {
+			"args": {
+				"text": "🔏"
+			}
+		},
+		"powerline.segments.vim.modified_indicator": {
+			"args": {
+				"text": "🖫⃥"
+			}
+		}
+	}
+}

powerline/config/themes/shell/__main__.json

@@ -1,14 +0,0 @@
-{
-	"segment_data": {
-		"hostname": {
-			"args": {
-				"only_if_ssh": true
-			}
-		},
-		"cwd": {
-			"args": {
-				"dir_limit_depth": 3
-			}
-		}
-	}
-}

powerline/config/themes/shell/continuation.json

@@ -1,12 +0,0 @@
-{
-	"default_module": "powerline.segments.shell",
-	"segments": {
-		"left": [
-			{
-				"function": "continuation"
-			}
-		],
-		"right": [
-		]
-	}
-}

powerline/config/themes/shell/default.json

@@ -1,40 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"left": [
-			{
-				"function": "powerline.segments.shell.mode"
-			},
-			{
-				"function": "hostname",
-				"priority": 10
-			},
-			{
-				"function": "user",
-				"priority": 30
-			},
-			{
-				"function": "virtualenv",
-				"priority": 50
-			},
-			{
-				"function": "powerline.segments.shell.cwd",
-				"priority": 10
-			},
-			{
-				"function": "powerline.segments.shell.jobnum",
-				"priority": 20
-			}
-		],
-		"right": [
-			{
-				"function": "powerline.segments.shell.last_pipe_status",
-				"priority": 10
-			},
-			{
-				"function": "branch",
-				"priority": 40
-			}
-		]
-	}
-}

powerline/config/themes/shell/default_leftonly.json

@@ -1,35 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"left": [
-			{
-				"function": "hostname",
-				"priority": 10
-			},
-			{
-				"function": "user",
-				"priority": 30
-			},
-			{
-				"function": "virtualenv",
-				"priority": 50
-			},
-			{
-				"function": "branch",
-				"priority": 40
-			},
-			{
-				"function": "powerline.segments.shell.cwd",
-				"priority": 10
-			},
-			{
-				"function": "powerline.segments.shell.jobnum",
-				"priority": 20
-			},
-			{
-				"function": "powerline.segments.shell.last_status",
-				"priority": 10
-			}
-		]
-	}
-}

powerline/config/themes/shell/select.json

@@ -1,13 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "Select variant",
-				"width": "auto",
-				"align": "r",
-				"highlight_group": ["continuation:current"]
-			}
-		]
-	}
-}

powerline/config/themes/tmux/cinaeco.json

@@ -1,14 +1,8 @@
 {
-  "default_module": "powerline.segments.common",
-  "segment_data": {
-    "external_ip": {
-      "before": "ⓦ  "
-    }
-  },
   "segments": {
-    "left" : [
+    "left": [
       {
-        "function": "hostname",
+        "function": "powerline.segments.common.net.hostname",
         "args": {
           "exclude_domain": true
         }
@@ -16,7 +10,11 @@
     ],
     "right": [
       {
-        "function": "date",
+        "function": "powerline.segments.common.time.date"
+      },
+      {
+        "function": "powerline.segments.common.time.date",
+        "name": "time",
         "args": {
           "format": "%H:%M",
           "istime": true

powerline/config/themes/tmux/default.json

@@ -1,29 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"right": [
-			{
-				"function": "uptime",
-				"priority": 50
-			},
-			{
-				"function": "system_load",
-				"priority": 50
-			},
-			{
-				"function": "date"
-			},
-			{
-				"function": "date",
-				"name": "time",
-				"args": {
-					"format": "%H:%M",
-					"istime": true
-				}
-			},
-			{
-				"function": "hostname"
-			}
-		]
-	}
-}

powerline/config/themes/unicode.json

@@ -19,6 +19,16 @@
 				"ellipsis": "⋯"
 			}
 		},
+		"player": {
+			"args": {
+				"state_symbols": {
+					"fallback": "♫",
+					"play":     "▶",
+					"pause":    "▮▮",
+					"stop":     "■"
+				}
+			}
+		},
 
 		"line_current_symbol": {
 			"contents": "␤ "
@@ -28,41 +38,31 @@
 			"before": "⌚ "
 		},
 
-		"powerline.segments.common.network_load": {
+		"powerline.segments.common.net.network_load": {
 			"args": {
 				"recv_format": "⬇ {value:>8}",
 				"sent_format": "⬆ {value:>8}"
 			}
 		},
-		"powerline.segments.common.now_playing": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "▶",
-					"pause":    "▮▮",
-					"stop":     "■"
-				}
-			}
+		"powerline.segments.common.net.hostname": {
+			"before": "⌂ "
 		},
-		"powerline.segments.common.battery": {
+		"powerline.segments.common.bat.battery": {
 			"args": {
 				"full_heart": "♥",
 				"empty_heart": "♥"
 			}
 		},
-		"powerline.segments.common.uptime": {
+		"powerline.segments.common.sys.uptime": {
 			"before": "⇑  "
 		},
-		"powerline.segments.common.email_imap_alert": {
+		"powerline.segments.common.mail.email_imap_alert": {
 			"before": "✉ "
 		},
-		"powerline.segments.common.virtualenv": {
+		"powerline.segments.common.env.virtualenv": {
 			"before": "ⓔ  "
 		},
-		"powerline.segments.common.hostname": {
-			"before": "⌂ "
-		},
-		"powerline.segments.common.weather": {
+		"powerline.segments.common.wthr.weather": {
 			"args": {
 				"icons": {
 					"day":           "〇",
@@ -80,7 +80,7 @@
 				}
 			}
 		},
-		"powerline.segments.common.fuzzy_time": {
+		"powerline.segments.common.time.fuzzy_time": {
 			"args": {
 				"unicode_text": true
 			}
@@ -98,15 +98,15 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
-					"R":  "REPLACE",
-					"Rv": "V·RPLCE",
+					"R":  "RPLACE",
+					"Rv": "V·RPLC",
 					"c":  "COMMND",
-					"cv": "VIM EX",
-					"ce": "EX",
+					"cv": "VIM·EX",
+					"ce": "NRM·EX",
 					"r":  "PROMPT",
-					"rm": "MORE",
-					"r?": "CONFIRM",
-					"!":  "SHELL"
+					"rm": "-MORE-",
+					"r?": "CNFIRM",
+					"!":  "!SHELL"
 				}
 			}
 		},

powerline/config/themes/unicode_terminus.json

@@ -23,46 +23,46 @@
 		"line_current_symbol": {
 			"contents": "␤ "
 		},
+		"player": {
+			"args": {
+				"state_symbols": {
+					"fallback": "♫",
+					"play":     "▶",
+					"pause":    "▮▮",
+					"stop":     "■"
+				}
+			}
+		},
 
 		"time": {
 			"before": ""
 		},
 
-		"powerline.segments.common.network_load": {
+		"powerline.segments.common.net.network_load": {
 			"args": {
 				"recv_format": "⇓ {value:>8}",
 				"sent_format": "⇑ {value:>8}"
 			}
 		},
-		"powerline.segments.common.now_playing": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "▶",
-					"pause":    "▮▮",
-					"stop":     "■"
-				}
-			}
+		"powerline.segments.common.net.hostname": {
+			"before": "⌂ "
 		},
-		"powerline.segments.common.battery": {
+		"powerline.segments.common.bat.battery": {
 			"args": {
 				"full_heart": "♥",
 				"empty_heart": "♥"
 			}
 		},
-		"powerline.segments.common.uptime": {
+		"powerline.segments.common.sys.uptime": {
 			"before": "↑  "
 		},
-		"powerline.segments.common.email_imap_alert": {
+		"powerline.segments.common.mail.email_imap_alert": {
 			"before": "MAIL "
 		},
-		"powerline.segments.common.virtualenv": {
+		"powerline.segments.common.env.virtualenv": {
 			"before": "(e) "
 		},
-		"powerline.segments.common.hostname": {
-			"before": "⌂ "
-		},
-		"powerline.segments.common.weather": {
+		"powerline.segments.common.wthr.weather": {
 			"args": {
 				"icons": {
 					"day":           "DAY",
@@ -80,7 +80,7 @@
 				}
 			}
 		},
-		"powerline.segments.common.fuzzy_time": {
+		"powerline.segments.common.time.fuzzy_time": {
 			"args": {
 				"unicode_text": true
 			}
@@ -98,15 +98,15 @@
 					"S":  "S·LINE",
 					"^S": "S·BLCK",
 					"i":  "INSERT",
-					"R":  "REPLACE",
-					"Rv": "V·RPLCE",
+					"R":  "RPLACE",
+					"Rv": "V·RPLC",
 					"c":  "COMMND",
-					"cv": "VIM EX",
-					"ce": "EX",
+					"cv": "VIM·EX",
+					"ce": "NRM·EX",
 					"r":  "PROMPT",
-					"rm": "MORE",
-					"r?": "CONFIRM",
-					"!":  "SHELL"
+					"rm": "-MORE-",
+					"r?": "CNFIRM",
+					"!":  "!SHELL"
 				}
 			}
 		},

powerline/config/themes/unicode_terminus_condensed.json

@@ -24,46 +24,46 @@
 		"line_current_symbol": {
 			"contents": "␤"
 		},
+		"player": {
+			"args": {
+				"state_symbols": {
+					"fallback": "♫",
+					"play":     "▶",
+					"pause":    "▮▮",
+					"stop":     "■"
+				}
+			}
+		},
 
 		"time": {
 			"before": ""
 		},
 
-		"powerline.segments.common.network_load": {
+		"powerline.segments.common.net.network_load": {
 			"args": {
 				"recv_format": "⇓{value:>8}",
 				"sent_format": "⇑{value:>8}"
 			}
 		},
-		"powerline.segments.common.now_playing": {
-			"args": {
-				"state_symbols": {
-					"fallback": "♫",
-					"play":     "▶",
-					"pause":    "▮▮",
-					"stop":     "■"
-				}
-			}
+		"powerline.segments.common.net.hostname": {
+			"before": "⌂"
 		},
-		"powerline.segments.common.battery": {
+		"powerline.segments.common.bat.battery": {
 			"args": {
 				"full_heart": "♥",
 				"empty_heart": "♥"
 			}
 		},
-		"powerline.segments.common.uptime": {
+		"powerline.segments.common.sys.uptime": {
 			"before": "↑"
 		},
-		"powerline.segments.common.email_imap_alert": {
+		"powerline.segments.common.mail.email_imap_alert": {
 			"before": "M "
 		},
-		"powerline.segments.common.virtualenv": {
+		"powerline.segments.common.env.virtualenv": {
 			"before": "E "
 		},
-		"powerline.segments.common.hostname": {
-			"before": "⌂"
-		},
-		"powerline.segments.common.weather": {
+		"powerline.segments.common.wthr.weather": {
 			"args": {
 				"icons": {
 					"day":           "D",
@@ -81,7 +81,7 @@
 				}
 			}
 		},
-		"powerline.segments.common.fuzzy_time": {
+		"powerline.segments.common.time.fuzzy_time": {
 			"args": {
 				"unicode_text": true
 			}

powerline/config/themes/vim/cmdwin.json

@@ -4,11 +4,11 @@
 			{
 				"type": "string",
 				"contents": "Command Line",
-				"highlight_group": ["file_name"]
+				"highlight_groups": ["file_name"]
 			},
 			{
 				"type": "string",
-				"highlight_group": ["background"],
+				"highlight_groups": ["background"],
 				"draw_soft_divider": false,
 				"draw_hard_divider": false,
 				"width": "auto"

powerline/config/themes/vim/default.json

@@ -15,6 +15,11 @@
 				"exclude_modes": ["nc"],
 				"priority": 10
 			},
+			{
+				"function": "powerline.segments.vim.plugin.capslock.capslock_indicator",
+				"include_modes": ["i", "R", "Rv"],
+				"priority": 10
+			},
 			{
 				"function": "branch",
 				"exclude_modes": ["nc"],
@@ -66,7 +71,7 @@
 			},
 			{
 				"type": "string",
-				"highlight_group": ["background"],
+				"highlight_groups": ["background"],
 				"draw_soft_divider": false,
 				"draw_hard_divider": false,
 				"width": "auto"
@@ -95,10 +100,14 @@
 				"width": 4,
 				"align": "r"
 			},
+			{
+				"function": "csv_col_current",
+				"priority": 30
+			},
 			{
 				"type": "string",
 				"name": "line_current_symbol",
-				"highlight_group": ["line_current_symbol", "line_current"]
+				"highlight_groups": ["line_current_symbol", "line_current"]
 			},
 			{
 				"function": "line_current",

powerline/config/themes/vim/help.json

@@ -7,7 +7,7 @@
 			},
 			{
 				"type": "string",
-				"highlight_group": ["background"],
+				"highlight_groups": ["background"],
 				"draw_soft_divider": false,
 				"draw_hard_divider": false,
 				"width": "auto"
@@ -23,7 +23,7 @@
 			{
 				"type": "string",
 				"name": "line_current_symbol",
-				"highlight_group": ["line_current_symbol", "line_current"]
+				"highlight_groups": ["line_current_symbol", "line_current"]
 			},
 			{
 				"function": "line_current",

powerline/config/themes/vim/plugin/ctrlp.json

@@ -1,28 +0,0 @@
-{
-	"default_module": "powerline.segments.plugin.ctrlp",
-	"segments": {
-		"left": [
-			{
-				"name": "ctrlp",
-				"args": {
-					"side": "left"
-				}
-			},
-			{
-				"type": "string",
-				"highlight_group": ["ctrlp.background", "background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-			{
-				"name": "ctrlp",
-				"args": {
-					"side": "right"
-				}
-			}
-		]
-	}
-}

powerline/config/themes/vim/plugin/gundo-preview.json

@@ -1,19 +0,0 @@
-{
-	"default_module": "powerline.segments.plugin.gundo",
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"highlight_group": ["gundo.name", "file_name"],
-				"contents": "Undo diff"
-			},
-			{
-				"type": "string",
-				"highlight_group": ["gundo.background", "background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		]
-	}
-}

powerline/config/themes/vim/plugin/gundo.json

@@ -1,19 +0,0 @@
-{
-	"default_module": "powerline.segments.plugin.gundo",
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"highlight_group": ["gundo.name", "file_name"],
-				"contents": "Undo tree"
-			},
-			{
-				"type": "string",
-				"highlight_group": ["gundo.background", "background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		]
-	}
-}

powerline/config/themes/vim/plugin/nerdtree.json

@@ -1,17 +0,0 @@
-{
-	"default_module": "powerline.segments.plugin.nerdtree",
-	"segments": {
-		"left": [
-			{
-				"name": "nerdtree"
-			},
-			{
-				"type": "string",
-				"highlight_group": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		]
-	}
-}

powerline/config/themes/vim/plugin_commandt.json

@@ -0,0 +1,26 @@
+{
+	"segments": {
+		"left": [
+			{
+				"type": "string",
+				"contents": "Command-T",
+				"highlight_groups": ["commandt:label"]
+			},
+			{
+				"function": "powerline.segments.vim.plugin.commandt.finder"
+			},
+			{
+				"function": "powerline.segments.vim.plugin.commandt.path"
+			},
+			{
+				"type": "string",
+				"highlight_groups": ["commandt:background"],
+				"draw_soft_divider": false,
+				"draw_hard_divider": false,
+				"width": "auto"
+			}
+		],
+		"right": [
+		]
+	}
+}

powerline/config/themes/vim/plugin_ctrlp.json

@@ -1,28 +0,0 @@
-{
-	"default_module": "powerline.segments.vim.plugin.ctrlp",
-	"segments": {
-		"left": [
-			{
-				"function": "ctrlp",
-				"args": {
-					"side": "left"
-				}
-			},
-			{
-				"type": "string",
-				"highlight_group": ["ctrlp.background", "background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-			{
-				"function": "ctrlp",
-				"args": {
-					"side": "right"
-				}
-			}
-		]
-	}
-}

powerline/config/themes/vim/plugin_gundo-preview.json

@@ -3,12 +3,12 @@
 		"left": [
 			{
 				"type": "string",
-				"highlight_group": ["gundo.name", "file_name"],
+				"highlight_groups": ["gundo:name", "file_name"],
 				"contents": "Undo diff"
 			},
 			{
 				"type": "string",
-				"highlight_group": ["gundo.background", "background"],
+				"highlight_groups": ["gundo:background", "background"],
 				"draw_soft_divider": false,
 				"draw_hard_divider": false,
 				"width": "auto"

powerline/config/themes/vim/plugin_gundo.json

@@ -3,12 +3,12 @@
 		"left": [
 			{
 				"type": "string",
-				"highlight_group": ["gundo.name", "file_name"],
+				"highlight_groups": ["gundo:name", "file_name"],
 				"contents": "Undo tree"
 			},
 			{
 				"type": "string",
-				"highlight_group": ["gundo.background", "background"],
+				"highlight_groups": ["gundo:background", "background"],
 				"draw_soft_divider": false,
 				"draw_hard_divider": false,
 				"width": "auto"

powerline/config/themes/vim/plugin_nerdtree.json

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

powerline/config/themes/vim/quickfix.json

@@ -9,7 +9,7 @@
 			{
 				"type": "string",
 				"name": "buffer_name",
-				"highlight_group": ["file_name"]
+				"highlight_groups": ["file_name"]
 			},
 			{
 				"function": "window_title",
@@ -17,7 +17,7 @@
 			},
 			{
 				"type": "string",
-				"highlight_group": ["background"],
+				"highlight_groups": ["background"],
 				"draw_soft_divider": false,
 				"draw_hard_divider": false,
 				"width": "auto"
@@ -27,7 +27,7 @@
 			{
 				"type": "string",
 				"name": "line_current_symbol",
-				"highlight_group": ["line_current_symbol", "line_current"]
+				"highlight_groups": ["line_current_symbol", "line_current"]
 			},
 			{
 				"function": "line_current",

powerline/config/themes/vim/tabline.json

@@ -58,7 +58,7 @@
 			},
 			{
 				"type": "string",
-				"highlight_group": ["background"],
+				"highlight_groups": ["background"],
 				"draw_soft_divider": false,
 				"draw_hard_divider": false,
 				"width": "auto"
@@ -69,14 +69,14 @@
 				"type": "string",
 				"contents": "Bufs",
 				"name": "single_tab",
-				"highlight_group": ["single_tab"],
+				"highlight_groups": ["single_tab"],
 				"include_function": "single_tab"
 			},
 			{
 				"type": "string",
 				"contents": "Tabs",
 				"name": "many_tabs",
-				"highlight_group": ["many_tabs"],
+				"highlight_groups": ["many_tabs"],
 				"exclude_function": "single_tab"
 			}
 		]

powerline/config/themes/wm/default.json

@@ -1,30 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"right": [
-			{
-				"function": "weather",
-				"priority": 50
-			},
-			{
-				"function": "date"
-			},
-			{
-				"function": "date",
-				"name": "time",
-				"args": {
-					"format": "%H:%M",
-					"istime": true
-				}
-			},
-			{
-				"function": "email_imap_alert",
-				"priority": 10,
-				"args": {
-					"username": "",
-					"password": ""
-				}
-			}
-		]
-	}
-}

powerline/powerline

@@ -1 +1 @@
-Subproject commit 39dda39bdc4e323631634e78941fa96c4cc10dff
+Subproject commit 4d1b8e43ad824d48cf9731eaa6a8bf28f4fb2471

tmux/rainbarf

@@ -1 +1 @@
-Subproject commit 53659a886a7bd7b9be11ef86bb53b2c3b2fafba8
+Subproject commit dc80751f9f1d90e4355bf4206eaaf0c66d7cc52f

tmux/tmux-colors-solarized

@@ -1 +1 @@
-Subproject commit 91c50cf61112601307fec7124a7d7413480460ca
+Subproject commit 50299c1dd6407bc415360a6173de247b86fab9b8

zsh/oh-my-zsh

@@ -1 +1 @@
-Subproject commit 96e4e5dd032d2df75f87d5b3e5594d527c655b16
+Subproject commit 4224c2a1af2a1b99c14ef81012af321c39856cf5