update powerline config files for `develop`

powerline/config/colors.json

@@ -74,9 +74,37 @@
 		"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"]
+		],
+		"green_yellow_orange_red": [
+			[2, 3, 9, 1],
+			["719e07", "739d06", "759c06", "779c06", "799b06", "7b9a05", "7d9a05", "7f9905", "819805", "839805", "859704", "879704", "899604", "8b9504", "8d9504", "8f9403", "919303", "949303", "969203", "989102", "9a9102", "9c9002", "9e9002", "a08f02", "a28e01", "a48e01", "a68d01", "a88c01", "aa8c01", "ac8b00", "ae8a00", "b08a00", "b28900", "b58900", "b58700", "b68501", "b78302", "b78102", "b87f03", "b97d04", "b97b04", "ba7905", "bb7806", "bb7606", "bc7407", "bd7208", "bd7008", "be6e09", "bf6c0a", "bf6a0a", "c0690b", "c1670c", "c1650c", "c2630d", "c3610e", "c35f0e", "c45d0f", "c55b10", "c55a10", "c65811", "c75612", "c75412", "c85213", "c95014", "c94e14", "ca4c15", "cb4b16", "cb4a16", "cc4917", "cc4818", "cd4719", "cd4719", "ce461a", "ce451b", "cf441c", "cf441c", "d0431d", "d0421e", "d1411f", "d1411f", "d24020", "d23f21", "d33e22", "d33e22", "d43d23", "d43c24", "d53b25", "d53b25", "d63a26", "d63927", "d73828", "d73828", "d83729", "d8362a", "d9352b", "d9352b", "da342c", "da332d", "db322e", "dc322f"]
+		],
+		"yellow_red": [
+			[220, 178, 172, 166, 160],
+			["ffd700", "fdd500", "fbd300", "fad200", "f8d000", "f7cf00", "f5cd00", "f3cb00", "f2ca00", "f0c800", "efc700", "edc500", "ebc300", "eac200", "e8c000", "e7bf00", "e5bd00", "e3bb00", "e2ba00", "e0b800", "dfb700", "ddb500", "dbb300", "dab200", "d8b000", "d7af00", "d7ad00", "d7ab00", "d7aa00", "d7a800", "d7a700", "d7a500", "d7a300", "d7a200", "d7a000", "d79f00", "d79d00", "d79b00", "d79a00", "d79800", "d79700", "d79500", "d79300", "d79200", "d79000", "d78f00", "d78d00", "d78b00", "d78a00", "d78800", "d78700", "d78500", "d78300", "d78200", "d78000", "d77f00", "d77d00", "d77b00", "d77a00", "d77800", "d77700", "d77500", "d77300", "d77200", "d77000", "d76f00", "d76d00", "d76b00", "d76a00", "d76800", "d76700", "d76500", "d76300", "d76200", "d76000", "d75f00", "d75b00", "d75700", "d75300", "d74f00", "d74c00", "d74800", "d74400", "d74000", "d73c00", "d73900", "d73500", "d73100", "d72d00", "d72900", "d72600", "d72200", "d71e00", "d71a00", "d71600", "d71300", "d70f00", "d70b00", "d70700"]
+		],
+		"yellow_orange_red": [
+			[3, 9, 1],
+			["b58900", "b58700", "b58600", "b68501", "b68401", "b78202", "b78102", "b88003", "b87f03", "b87d03", "b97c04", "b97b04", "ba7a05", "ba7805", "bb7706", "bb7606", "bc7507", "bc7307", "bc7207", "bd7108", "bd7008", "be6e09", "be6d09", "bf6c0a", "bf6b0a", "c06a0b", "c0680b", "c0670b", "c1660c", "c1650c", "c2630d", "c2620d", "c3610e", "c3600e", "c35e0e", "c45d0f", "c45c0f", "c55b10", "c55910", "c65811", "c65711", "c75612", "c75412", "c75312", "c85213", "c85113", "c94f14", "c94e14", "ca4d15", "ca4c15", "cb4b16", "cb4a16", "cb4a17", "cc4917", "cc4918", "cc4818", "cd4819", "cd4719", "cd471a", "ce461a", "ce461b", "ce451b", "cf451c", "cf441c", "cf441d", "d0431d", "d0431e", "d0421e", "d1421f", "d1411f", "d14120", "d24020", "d24021", "d23f21", "d33f22", "d33e22", "d33e23", "d43d23", "d43d24", "d43c24", "d53c25", "d53b25", "d53b26", "d63a26", "d63a27", "d63927", "d73928", "d73828", "d73829", "d83729", "d8372a", "d8362a", "d9362b", "d9352b", "d9352c", "da342c", "da342d", "da332d", "db332e"]
+		],
+		"blue_red": [
+			[39, 74, 68, 67, 103, 97, 96, 132, 131, 167, 203, 197],
+			["19b4fe", "1bb2fc", "1db1fa", "1faff8", "22aef6", "24adf4", "26abf2", "29aaf0", "2ba9ee", "2da7ec", "30a6ea", "32a5e8", "34a3e6", "36a2e4", "39a0e2", "3b9fe1", "3d9edf", "409cdd", "429bdb", "449ad9", "4798d7", "4997d5", "4b96d3", "4d94d1", "5093cf", "5292cd", "5490cb", "578fc9", "598dc7", "5b8cc6", "5e8bc4", "6089c2", "6288c0", "6487be", "6785bc", "6984ba", "6b83b8", "6e81b6", "7080b4", "727eb2", "757db0", "777cae", "797aac", "7b79ab", "7e78a9", "8076a7", "8275a5", "8574a3", "8772a1", "89719f", "8c709d", "8e6e9b", "906d99", "926b97", "956a95", "976993", "996791", "9c668f", "9e658e", "a0638c", "a3628a", "a56188", "a75f86", "a95e84", "ac5c82", "ae5b80", "b05a7e", "b3587c", "b5577a", "b75678", "ba5476", "bc5374", "be5273", "c05071", "c34f6f", "c54e6d", "c74c6b", "ca4b69", "cc4967", "ce4865", "d14763", "d34561", "d5445f", "d7435d", "da415b", "dc4059", "de3f58", "e13d56", "e33c54", "e53a52", "e83950", "ea384e", "ec364c", "ee354a", "f13448", "f33246", "f53144", "f83042", "fa2e40"]
+		],
+		"white_red": [
+			[231, 223, 216, 209, 196],
+			["ffffff", "fffe61", "fffcc4", "fffb28", "fff98b", "fff7ef", "fff651", "fff4b4", "fff318", "fff17b", "ffefdf", "ffee41", "ffeca4", "ffeb08", "ffe96b", "ffe7cf", "ffe631", "ffe494", "ffe2f8", "ffe15b", "ffdfbf", "ffde21", "ffdc84", "ffdae8", "ffd94b", "ffd7af", "ffd602", "ffd455", "ffd2aa", "ffd0fd", "ffcf50", "ffcda5", "ffcbf8", "ffca4b", "ffc8a0", "ffc6f3", "ffc546", "ffc39b", "ffc1ee", "ffc041", "ffbe96", "ffbce9", "ffbb3c", "ffb991", "ffb7e4", "ffb637", "ffb48c", "ffb2df", "ffb132", "ffaf87", "ffadda", "ffac2d", "ffaa82", "ffa8d5", "ffa728", "ffa57d", "ffa3d0", "ffa223", "ffa078", "ff9ecb", "ff9d1e", "ff9b73", "ff99c6", "ff9819", "ff966e", "ff94c1", "ff9314", "ff9169", "ff8fbc", "ff8e0f", "ff8c64", "ff8ab7", "ff890a", "ff875f", "ff81f4", "ff7c8a", "ff771f", "ff71b5", "ff6c4c", "ff66e1", "ff6177", "ff5c0c", "ff56a2", "ff5139", "ff4bce", "ff4664", "ff40f9", "ff3b8f", "ff3626", "ff30bb", "ff2b51", "ff25e6", "ff207c", "ff1b13", "ff15a8", "ff103e", "ff0ad3", "ff0569", "ff0000"]
 		]
 	}
 }

powerline/config/colorschemes/ipython/default.json

@@ -2,6 +2,7 @@
 	"name": "Default color scheme for IPython prompt",
 	"groups": {
 		"virtualenv": { "fg": "white", "bg": "darkcyan" },
-		"prompt": { "fg": "gray9", "bg": "gray4" }
+		"prompt": { "fg": "gray9", "bg": "gray4" },
+		"prompt_count": { "fg": "white", "bg": "gray4" }
 	}
 }

powerline/config/colorschemes/shell/default.json

@@ -5,11 +5,14 @@
 		"superuser": { "fg": "white", "bg": "brightred", "attr": ["bold"] },
 		"virtualenv": { "fg": "white", "bg": "darkcyan" },
 		"branch": { "fg": "gray9", "bg": "gray2" },
+		"branch_dirty": { "fg": "brightyellow", "bg": "gray2" },
+		"branch_clean": { "fg": "gray9", "bg": "gray2" },
 		"cwd": { "fg": "gray9", "bg": "gray4" },
 		"cwd:current_folder": { "fg": "gray10", "bg": "gray4", "attr": ["bold"] },
 		"cwd:divider": { "fg": "gray7", "bg": "gray4" },
 		"hostname": { "fg": "brightyellow", "bg": "mediumorange" },
 		"exit_fail": { "fg": "white", "bg": "darkestred" },
-		"exit_success": { "fg": "white", "bg": "darkestgreen" }
+		"exit_success": { "fg": "white", "bg": "darkestgreen" },
+		"environment": { "fg": "white", "bg": "darkestgreen" }
 	}
 }

powerline/config/colorschemes/shell/solarized.json

@@ -5,11 +5,14 @@
 		"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" }
+		"exit_success":       { "fg": "oldlace", "bg": "green" },
+		"environment":        { "fg": "oldlace", "bg": "green" }
 	}
 }

powerline/config/colorschemes/tmux/default.json

@@ -7,19 +7,21 @@
 		"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_cold": { "fg": "steelblue", "bg": "gray0" },
-		"weather_temp_hot": { "fg": "darkorange3", "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_good": { "fg": "lightyellowgreen", "bg": "gray0" },
-		"system_load_bad": { "fg": "gold3", "bg": "gray0" },
-		"system_load_ugly": { "fg": "orangered", "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/default.json

@@ -1,31 +1,39 @@
 {
 	"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: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"] },
+		"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" },
+		"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" },
+		"virtcol_current_gradient": { "fg": "dark_GREEN_Orange_red", "bg": "gray10" },
+		"col_current":              { "fg": "gray6", "bg": "gray10" },
+		"modified_buffers":         { "fg": "brightyellow", "bg": "gray2" },
+		"environment":              { "fg": "gray8", "bg": "gray2" },
+		"error":                    { "fg": "brightestred", "bg": "darkred", "attr": ["bold"] },
+		"warning":                  { "fg": "brightyellow", "bg": "darkorange", "attr": ["bold"] },
+		"current_tag":              { "fg": "gray9", "bg": "gray2" }
 	},
 	"mode_translations": {
 		"nc": {
@@ -63,9 +71,9 @@
 				"green_yellow_red": "gray5"
 			},
 			"groups": {
-				"mode": { "fg": "darkestcyan", "bg": "white", "attr": ["bold"] },
+				"mode":               { "fg": "darkestcyan", "bg": "white", "attr": ["bold"] },
 				"background:divider": { "fg": "darkcyan", "bg": "darkestblue" },
-				"branch:divider": { "fg": "darkcyan", "bg": "darkblue" }
+				"branch:divider":     { "fg": "darkcyan", "bg": "darkblue" }
 			}
 		},
 		"v": {

powerline/config/colorschemes/vim/solarized.json

@@ -1,29 +1,38 @@
 {
 	"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: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_current":           { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] },
-		"line_current_symbol":    { "fg": "gray13", "bg": "lightyellow" },
-		"col_current":            { "fg": "azure4", "bg": "lightyellow" }
+		"background":               { "fg": "oldlace", "bg": "royalblue5" },
+		"background:divider":       { "fg": "lightskyblue4", "bg": "royalblue5" },
+		"mode":                     { "fg": "oldlace", "bg": "green", "attr": ["bold"] },
+		"visual_range":             { "fg": "green", "bg": "oldlace", "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" },
+		"virtcol_current_gradient": { "fg": "GREEN_Orange_red", "bg": "gray10" },
+		"col_current":              { "fg": "azure4", "bg": "lightyellow" },
+		"environment":              { "fg": "gray61", "bg": "royalblue5" },
+		"error":                    { "fg": "oldlace", "bg": "red", "attr": ["bold"] },
+		"warning":                  { "fg": "oldlace", "bg": "orange", "attr": ["bold"] },
+		"current_tag":              { "fg": "oldlace", "bg": "royalblue5", "attr": ["bold"] }
 	},
 	"mode_translations": {
 		"nc": {
@@ -58,6 +67,7 @@
 				"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" }
@@ -73,6 +83,11 @@
 				"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
 			}
 		},
+		"^V": {
+			"groups": {
+				"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+			}
+		},
 		"R": {
 			"groups": {
 				"mode": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }

powerline/config/colorschemes/wm/default.json

@@ -7,10 +7,10 @@
 		"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_cold": { "fg": "steelblue", "bg": "gray0" },
-		"weather_temp_hot": { "fg": "darkorange3", "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" },
@@ -20,6 +20,7 @@
 		"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" }
+		"system_load_ugly": { "fg": "orangered", "bg": "gray0" },
+		"environment": { "fg": "gray8", "bg": "gray0" }
 	}
 }

powerline/config/config.json

@@ -1,6 +1,6 @@
 {
 	"common": {
-		"term_24bit_colors": false,
+		"term_truecolor": false,
 		"dividers": {
 			"left": {
 				"hard": " ",
@@ -11,13 +11,17 @@
 				"soft": " "
 			}
 		},
-		"spaces": 1,
-		"colors": "default"
+		"spaces": 1
 	},
 	"ext": {
 		"ipython": {
 			"colorscheme": "default",
-			"theme": "default"
+			"theme": "in",
+			"local_themes": {
+				"rewrite": "rewrite",
+				"out": "out",
+				"in2": "in2"
+			}
 		},
 		"shell": {
 			"colorscheme": "default",
@@ -32,7 +36,13 @@
 			"theme": "default",
 			"local_themes": {
 				"cmdwin": "cmdwin",
-				"help": "help"
+				"help": "help",
+				"quickfix": "quickfix",
+
+				"powerline.matchers.plugin.nerdtree.nerdtree": "plugin/nerdtree",
+				"powerline.matchers.plugin.ctrlp.ctrlp": "plugin/ctrlp",
+				"powerline.matchers.plugin.gundo.gundo": "plugin/gundo",
+				"powerline.matchers.plugin.gundo.gundo_preview": "plugin/gundo-preview"
 			}
 		},
 		"wm": {

powerline/config/themes/ipython/default.json

@@ -1,16 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"left": [
-			{
-				"name": "virtualenv"
-			},
-			{
-				"type": "string",
-				"contents": "In:",
-				"highlight_group": ["prompt"],
-				"draw_divider": false
-			}
-		]
-	}
-}

powerline/config/themes/ipython/in.json

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

powerline/config/themes/ipython/in2.json

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

powerline/config/themes/ipython/out.json

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

powerline/config/themes/ipython/rewrite.json

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

powerline/config/themes/tmux/default.json

@@ -24,22 +24,10 @@
 				"name": "uptime",
 				"priority": 50
 			},
-			{
-				"name": "external_ip",
-				"priority": 50
-			},
-			{
-				"name": "network_load",
-				"priority": 50
-			},
 			{
 				"name": "system_load",
 				"priority": 50
 			},
-			{
-				"name": "weather",
-				"priority": 50
-			},
 			{
 				"name": "date"
 			},
@@ -50,10 +38,6 @@
 					"istime": true
 				}
 			},
-			{
-				"name": "email_imap_alert",
-				"priority": 10
-			},
 			{
 				"name": "hostname"
 			}

powerline/config/themes/vim/cmdwin.json

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

powerline/config/themes/vim/default.json

@@ -20,6 +20,11 @@
 				"name": "mode",
 				"exclude_modes": ["nc"]
 			},
+			{
+				"name": "visual_range",
+				"exclude_modes": ["nc"],
+				"priority": 10
+			},
 			{
 				"name": "paste_indicator",
 				"exclude_modes": ["nc"],
@@ -28,58 +33,72 @@
 			{
 				"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": " "
 			},
+			{
+				"exclude_modes": ["nc"],
+				"module": "powerline.segments.plugin.syntastic",
+				"name": "syntastic",
+				"priority": 50
+			},
+			{
+				"exclude_modes": ["nc"],
+				"module": "powerline.segments.plugin.tagbar",
+				"name": "current_tag",
+				"draw_soft_divider": false,
+				"priority": 50
+			},
 			{
 				"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": 50
+				"priority": 60
 			},
 			{
 				"name": "line_percent",
-				"priority": 30,
+				"priority": 50,
 				"width": 4,
 				"align": "r"
 			},
@@ -90,14 +109,14 @@
 			},
 			{
 				"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"

powerline/config/themes/vim/help.json

@@ -3,12 +3,13 @@
 		"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"
 			}
 		],
@@ -26,7 +27,7 @@
 			},
 			{
 				"name": "line_current",
-				"draw_divider": false,
+				"draw_soft_divider": false,
 				"width": 3,
 				"align": "r"
 			}

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

@@ -0,0 +1,28 @@
+{
+	"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

@@ -0,0 +1,19 @@
+{
+	"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

@@ -0,0 +1,19 @@
+{
+	"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

@@ -0,0 +1,17 @@
+{
+	"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/quickfix.json

@@ -0,0 +1,37 @@
+{
+	"segment_data": {
+		"buffer_name": {
+			"contents": "Location List"
+		}
+	},
+	"segments": {
+		"left": [
+			{
+				"type": "string",
+				"name": "buffer_name",
+				"highlight_group": ["file_name"],
+				"draw_soft_divider": false
+			},
+			{
+				"type": "string",
+				"highlight_group": ["background"],
+				"draw_soft_divider": false,
+				"draw_hard_divider": false,
+				"width": "auto"
+			}
+		],
+		"right": [
+			{
+				"type": "string",
+				"name": "line_current_symbol",
+				"highlight_group": ["line_current_symbol", "line_current"]
+			},
+			{
+				"name": "line_current",
+				"draw_soft_divider": false,
+				"width": 3,
+				"align": "r"
+			}
+		]
+	}
+}

powerline/rainbarf

@@ -1 +1 @@
-Subproject commit 8e3f90660944bbd90d1751aa8edcd31d67fb7b7e
+Subproject commit e467bbd5fe4c3be31fc21a13f40709f4dc3dbe82

vim/bundle/ctrlp-funky

@@ -1 +1 @@
-Subproject commit 44cfd90d5ffb8f637a80b09f768ac919bf10fb80
+Subproject commit 98e1f3a4431e2607254ee27df7824e2d275fab70

vim/bundle/syntastic

@@ -1 +1 @@
-Subproject commit c035ac24269b999a4caebb5bb7b318ee96614129
+Subproject commit f92741d3f62e333eff76639b378a980ce8ea9a70

vim/bundle/tlib

@@ -1 +1 @@
-Subproject commit d69e11e39ac30741841585b81deb6fde16419d41
+Subproject commit 9f333d3d4173a17e4ced707aa9797321b157e5e3

vim/bundle/vdebug

@@ -1 +1 @@
-Subproject commit 4c36c231ff4b40b16572b4800fa362b27bb12ba3
+Subproject commit d58f15a167318914f97e3da8c6782ea4eb6ddc6d

vim/bundle/vim-snippets

@@ -1 +1 @@
-Subproject commit b4c26c41b95b4b4c6707d94a48b13c1e3f2afebe
+Subproject commit f4f1b193ec86c25f98d73e39c0dba8c5c3f488c5

vim/vimrc

@@ -251,7 +251,7 @@ nnoremap <silent> <leader>b    :Gblame<CR>
 nnoremap <silent> <leader>gd   :Gdiff<CR>
 
 " Function definition jumping with CtrlP's Funky plugin
-nnoremap <C-F> :CtrlPFunky<CR>
+nnoremap <silent> <C-F> :CtrlPFunky<CR>
 
 " Code heirarchy with Tagbar
 nnoremap <silent> <leader>t    :TagbarToggle<CR>
@@ -268,10 +268,10 @@ vmap H ^
 vmap L $
 
 " Smart way to move between windows
-nnoremap <C-j> <C-W>j
-nnoremap <C-k> <C-W>k
-nnoremap <C-h> <C-W>h
-nnoremap <C-l> <C-W>l
+nnoremap <C-j> <C-w>j
+nnoremap <C-k> <C-w>k
+nnoremap <C-h> <C-w>h
+nnoremap <C-l> <C-w>l
 
 " mapping to make movements operate on 1 screen line in wrap mode
 onoremap <silent> <expr> j ScreenMovement("j")