[powerline] Update powerline, add Solaried tmux theme
diff --git a/.gitmodules b/.gitmodules
index 53adc176..45144b57 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -100,3 +100,6 @@
[submodule "vim/.vim/bundle/vim-startify"]
path = vim/.vim/bundle/vim-startify
url = https://github.com/mhinz/vim-startify.git
+[submodule "src/tmux-colors-solarized"]
+ path = src/tmux-colors-solarized
+ url = https://github.com/seebi/tmux-colors-solarized.git
diff --git a/config/.config/powerline/colors.json b/config/.config/powerline/colors.json
index 5b8a7645..6bfadf7b 100644
--- a/config/.config/powerline/colors.json
+++ b/config/.config/powerline/colors.json
@@ -16,6 +16,7 @@
"darkestblue": 24,
"darkblue": 31,
+ "red": 1,
"darkestred": 52,
"darkred": 88,
"mediumred": 124,
@@ -45,25 +46,6 @@
"gray9": 250,
"gray10": 252,
- "gray61": [14, "93a1a1"],
- "gray13": [8, "002b36"],
-
- "royalblue5": [0, "073642"],
- "darkgreencopper": [10, "586e75"],
- "lightskyblue4": [11, "657b83"],
- "azure4": [12, "839496"],
- "lightyellow": [7, "eee8d5"],
- "oldlace": [15, "fdf6e3"],
-
- "green": [2, "719e07"],
- "cyan": [6, "2aa198"],
- "blue": [4, "268bd2"],
- "red": [1, "dc322f"],
- "magenta": [5, "d33682"],
- "violet": [13, "6c71c4"],
- "orange": [9, "cb4b16"],
- "yellow": [3, "b58900"],
-
"lightyellowgreen": 106,
"gold3": 178,
"orangered": 202,
@@ -71,12 +53,29 @@
"steelblue": 67,
"darkorange3": 166,
"skyblue1": 117,
- "khaki1": 228
+ "khaki1": 228,
+
+ "solarized:base03": [8, "002b36"],
+ "solarized:base02": [0, "073642"],
+ "solarized:base01": [10, "586e75"],
+ "solarized:base00": [11, "657b83"],
+ "solarized:base0": [12, "839496"],
+ "solarized:base1": [14, "93a1a1"],
+ "solarized:base2": [7, "eee8d5"],
+ "solarized:base3": [15, "fdf6e3"],
+ "solarized:yellow": [3, "b58900"],
+ "solarized:orange": [9, "cb4b16"],
+ "solarized:red": [1, "dc322f"],
+ "solarized:magenta": [5, "d33682"],
+ "solarized:violet": [13, "6c71c4"],
+ "solarized:blue": [4, "268bd2"],
+ "solarized:cyan": [6, "2aa198"],
+ "solarized:green": [2, "859900"]
},
"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"]
+ [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, 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, 94, 94, 94, 94, 94, 94, 94, 88, 52],
+ ["006000", "006000", "006000", "006000", "006000", "006000", "006000", "006000", "006000", "036000", "076000", "0a6000", "0d6000", "106000", "126000", "146000", "166000", "186000", "1a6000", "1b6000", "1d6000", "1e6000", "206000", "216000", "236000", "246000", "256000", "266000", "286000", "296000", "2a6000", "2b6000", "2c6100", "2d6100", "2f6100", "306100", "316100", "326100", "336100", "346100", "356100", "366100", "376100", "386100", "386100", "396100", "3a6100", "3b6100", "3c6100", "3d6100", "3e6100", "3f6100", "406100", "406100", "416100", "426000", "436000", "446000", "456000", "456000", "466000", "476000", "486000", "496000", "496000", "4a6000", "4b6000", "4c6000", "4d6000", "4d6000", "4e6000", "4f6000", "506000", "506000", "516000", "526000", "536000", "536000", "546000", "556000", "566000", "566000", "576000", "586000", "596000", "596000", "5a6000", "5d6000", "616000", "646000", "686000", "6b6000", "6f6000", "726000", "766000", "796000", "7d6000", "806000", "7e5500", "6f3105", "5d0001"]
],
"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],
@@ -103,8 +102,16 @@
["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"]
+ [231, 255, 223, 216, 209, 202, 196],
+ ["ffffff", "fefefe", "fdfdfd", "fdfdfd", "fcfcfc", "fbfbfb", "fafafa", "fafafa", "f9f9f9", "f8f8f8", "f7f7f7", "f7f7f7", "f6f6f6", "f5f5f5", "f4f4f4", "f4f3f4", "f3f3f3", "f2f2f2", "f1f1f1", "f0f0f0", "f0f0f0", "efefef", "eeeeee", "efecea", "f1eae4", "f2e8de", "f3e6d8", "f5e4d3", "f6e2cd", "f7e0c7", "f8dec2", "f9dcbc", "fadab6", "fad8b1", "fbd5ac", "fbd2a9", "fbcea5", "fbcaa1", "fbc79e", "fbc39a", "fbc097", "fbbc93", "fbb88f", "fbb58c", "fab188", "faad85", "faaa81", "fba67e", "fba37a", "fb9f76", "fb9c73", "fb986f", "fb946c", "fb9168", "fa8d65", "fa8961", "fa865c", "fa8256", "fb7f4f", "fb7b48", "fb7841", "fb743a", "fb7133", "fb6d2c", "fa6a23", "fa661a", "fa620e", "fa5f03", "fa5d03", "fa5b03", "fa5a03", "fa5803", "fa5703", "fa5503", "fa5303", "fa5103", "fa4f03", "fa4e03", "fa4c03", "fa4a04", "fa4804", "fa4604", "fa4404", "fa4204", "fa3f04", "fa3d04", "fa3b04", "fa3805", "fa3605", "fa3305", "fb3105", "fb2e05", "fb2a05", "fb2705", "fb2306", "fb1f06", "fb1b06", "fb1506", "fb0e06", "fa0506", "fa0007"]
+ ],
+ "dark_green_gray": [
+ [70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, 247],
+ ["51b000", "52b000", "54b000", "55b002", "56b007", "57b00d", "58b011", "59af15", "5aaf18", "5caf1b", "5daf1e", "5eaf21", "5faf23", "60ae25", "61ae27", "62ae2a", "63ae2c", "64ae2e", "65ae30", "66ae31", "67ad33", "68ad35", "69ad37", "69ad38", "6aad3a", "6bad3c", "6cac3d", "6dac3f", "6eac40", "6fac42", "70ac44", "70ac45", "71ab47", "72ab48", "73ab49", "74ab4b", "75ab4c", "75ab4e", "76aa4f", "77aa51", "78aa52", "79aa53", "79aa55", "7aaa56", "7ba957", "7ca959", "7ca95a", "7da95b", "7ea95d", "7fa95e", "7fa85f", "80a861", "81a862", "81a863", "82a865", "83a766", "83a767", "84a768", "85a76a", "85a76b", "86a66c", "87a66d", "87a66f", "88a670", "89a671", "89a672", "8aa574", "8ba575", "8ba576", "8ca577", "8da579", "8da47a", "8ea47b", "8ea47c", "8fa47d", "90a47f", "90a380", "91a381", "91a382", "92a384", "93a385", "93a286", "94a287", "94a288", "95a28a", "95a18b", "96a18c", "97a18d", "97a18e", "98a190", "98a091", "99a092", "99a093", "9aa094", "9aa096", "9b9f97", "9b9f98", "9c9f99", "9c9f9a", "9d9e9c", "9d9e9d"]
+ ],
+ "light_green_gray": [
+ [148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 149, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 186, 187, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250],
+ ["a3d900", "a4d800", "a4d800", "a5d805", "a5d80d", "a6d714", "a6d719", "a6d71d", "a7d621", "a7d625", "a8d628", "a8d62b", "a8d52e", "a9d531", "a9d533", "aad536", "aad438", "aad43a", "abd43d", "abd33f", "abd341", "acd343", "acd345", "acd247", "add249", "add24b", "add14d", "aed14f", "aed151", "aed152", "afd054", "afd056", "afd058", "b0d059", "b0cf5b", "b0cf5d", "b1cf5e", "b1ce60", "b1ce62", "b1ce63", "b2ce65", "b2cd67", "b2cd68", "b3cd6a", "b3cc6b", "b3cc6d", "b3cc6e", "b4cc70", "b4cb71", "b4cb73", "b4cb75", "b5ca76", "b5ca78", "b5ca79", "b5ca7a", "b6c97c", "b6c97d", "b6c97f", "b6c880", "b6c882", "b7c883", "b7c885", "b7c786", "b7c788", "b7c789", "b8c68a", "b8c68c", "b8c68d", "b8c68f", "b8c590", "b9c591", "b9c593", "b9c494", "b9c496", "b9c497", "b9c498", "bac39a", "bac39b", "bac39d", "bac29e", "bac29f", "bac2a1", "bac2a2", "bac1a4", "bbc1a5", "bbc1a6", "bbc0a8", "bbc0a9", "bbc0aa", "bbc0ac", "bbbfad", "bbbfae", "bbbfb0", "bbbeb1", "bcbeb3", "bcbeb4", "bcbdb5", "bcbdb7", "bcbdb8", "bcbdb9", "bcbcbb"]
]
}
}
diff --git a/config/.config/powerline/colorschemes/ipython/default.json b/config/.config/powerline/colorschemes/ipython/default.json
index d7875916..54987c48 100644
--- a/config/.config/powerline/colorschemes/ipython/default.json
+++ b/config/.config/powerline/colorschemes/ipython/default.json
@@ -1,8 +1,7 @@
{
"name": "Default color scheme for IPython prompt",
"groups": {
- "virtualenv": { "fg": "white", "bg": "darkcyan" },
- "prompt": { "fg": "gray9", "bg": "gray4" },
- "prompt_count": { "fg": "white", "bg": "gray4" }
+ "prompt": { "fg": "gray9", "bg": "gray4", "attr": [] },
+ "prompt_count": { "fg": "white", "bg": "gray4", "attr": [] }
}
}
diff --git a/config/.config/powerline/colorschemes/shell/default.json b/config/.config/powerline/colorschemes/shell/default.json
index 9a5c5883..bb9e0d59 100644
--- a/config/.config/powerline/colorschemes/shell/default.json
+++ b/config/.config/powerline/colorschemes/shell/default.json
@@ -1,18 +1,19 @@
{
"name": "Default color scheme for shell prompts",
"groups": {
- "user": { "fg": "white", "bg": "darkblue", "attr": ["bold"] },
- "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" },
- "environment": { "fg": "white", "bg": "darkestgreen" }
+ "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"]}
+ }
+ }
}
}
diff --git a/config/.config/powerline/colorschemes/shell/solarized.json b/config/.config/powerline/colorschemes/shell/solarized.json
index 70093ba7..e9059bd6 100644
--- a/config/.config/powerline/colorschemes/shell/solarized.json
+++ b/config/.config/powerline/colorschemes/shell/solarized.json
@@ -1,18 +1,16 @@
{
- "name": "Solarized Dark",
+ "name": "Solarized dark for shell",
"groups": {
- "user": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] },
- "superuser": { "fg": "oldlace", "bg": "red", "attr": ["bold"] },
- "virtualenv": { "fg": "oldlace", "bg": "green" },
- "branch": { "fg": "gray61", "bg": "royalblue5" },
- "branch_dirty": { "fg": "yellow", "bg": "royalblue5" },
- "branch_clean": { "fg": "gray61", "bg": "royalblue5" },
- "cwd": { "fg": "lightyellow", "bg": "darkgreencopper" },
- "cwd:current_folder": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
- "cwd:divider": { "fg": "gray61", "bg": "darkgreencopper" },
- "hostname": { "fg": "oldlace", "bg": "darkgreencopper" },
- "exit_fail": { "fg": "oldlace", "bg": "red" },
- "exit_success": { "fg": "oldlace", "bg": "green" },
- "environment": { "fg": "oldlace", "bg": "green" }
+ "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"] }
+ }
+ }
}
}
diff --git a/config/.config/powerline/colorschemes/vim/default.json b/config/.config/powerline/colorschemes/vim/default.json
index 254383a1..53583b2e 100644
--- a/config/.config/powerline/colorschemes/vim/default.json
+++ b/config/.config/powerline/colorschemes/vim/default.json
@@ -1,39 +1,36 @@
{
"name": "Default color scheme",
"groups": {
- "background": { "fg": "white", "bg": "gray2" },
- "background:divider": { "fg": "gray6", "bg": "gray2" },
+ "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" },
- "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" },
+ "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"] },
- "file_size": { "fg": "gray8", "bg": "gray2" },
+ "window_title": { "fg": "white", "bg": "gray4", "attr": [] },
"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" },
+ "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" },
- "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" },
+ "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" }
+ "current_tag": { "fg": "gray9", "bg": "gray2", "attr": [] }
},
"mode_translations": {
"nc": {
@@ -52,7 +49,45 @@
"gray9": "gray4",
"gray10": "gray5",
"white": "gray6",
- "green_yellow_red": "gray5"
+ "dark_green_gray": "gray5"
+ }
+ },
+ "tab_nc": {
+ "colors": {
+ "brightyellow": "darkorange",
+ "brightestred": "darkred",
+ "gray0": "gray0",
+ "gray1": "gray0",
+ "gray2": "gray0",
+ "gray3": "gray1",
+ "gray4": "gray1",
+ "gray5": "gray1",
+ "gray6": "gray1",
+ "gray7": "gray4",
+ "gray8": "gray4",
+ "gray9": "gray4",
+ "gray10": "gray5",
+ "white": "gray6",
+ "dark_green_gray": "gray5"
+ }
+ },
+ "buf_nc": {
+ "colors": {
+ "brightyellow": "darkorange",
+ "brightestred": "darkred",
+ "gray0": "gray0",
+ "gray1": "gray0",
+ "gray2": "gray0",
+ "gray3": "gray1",
+ "gray4": "gray1",
+ "gray5": "gray1",
+ "gray6": "gray1",
+ "gray7": "gray4",
+ "gray8": "gray4",
+ "gray9": "gray4",
+ "gray10": "gray5",
+ "white": "gray6",
+ "dark_green_gray": "gray5"
}
},
"i": {
@@ -68,12 +103,13 @@
"gray8": "mediumcyan",
"gray9": "mediumcyan",
"gray10": "mediumcyan",
- "green_yellow_red": "gray5"
+ "green_yellow_red": "gray5",
+ "dark_green_gray": "light_green_gray"
},
"groups": {
"mode": { "fg": "darkestcyan", "bg": "white", "attr": ["bold"] },
- "background:divider": { "fg": "darkcyan", "bg": "darkestblue" },
- "branch:divider": { "fg": "darkcyan", "bg": "darkblue" }
+ "background:divider": { "fg": "darkcyan", "bg": "darkestblue", "attr": [] },
+ "branch:divider": { "fg": "darkcyan", "bg": "darkblue", "attr": [] }
}
},
"v": {
diff --git a/config/.config/powerline/colorschemes/vim/solarized.json b/config/.config/powerline/colorschemes/vim/solarized.json
index 869ebf1d..63038fbc 100644
--- a/config/.config/powerline/colorschemes/vim/solarized.json
+++ b/config/.config/powerline/colorschemes/vim/solarized.json
@@ -1,96 +1,115 @@
{
- "name": "Solarized Dark",
+ "name": "Solarized dark for vim",
"groups": {
- "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"] }
+ "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"] }
},
"mode_translations": {
"nc": {
"colors": {
- "darkgreencopper": "royalblue5",
- "lightskyblue4": "royalblue5",
- "azure4": "darkgreencopper",
- "gray61": "lightskyblue4",
- "lightyellow": "azure4",
- "oldlace": "gray61"
+ "solarized:base01": "solarized:base02",
+ "solarized:base00": "solarized:base02",
+ "solarized:base0": "solarized:base01",
+ "solarized:base1": "solarized:base00",
+ "solarized:base2": "solarized:base0",
+ "solarized:base3": "solarized:base1"
+ }
+ },
+ "tab_nc": {
+ "colors": {
+ "solarized:base01": "solarized:base02",
+ "solarized:base00": "solarized:base02",
+ "solarized:base0": "solarized:base01",
+ "solarized:base1": "solarized:base00",
+ "solarized:base2": "solarized:base0",
+ "solarized:base3": "solarized:base1"
+ }
+ },
+ "buf_nc": {
+ "colors": {
+ "solarized:base01": "solarized:base02",
+ "solarized:base00": "solarized:base02",
+ "solarized:base0": "solarized:base01",
+ "solarized:base1": "solarized:base00",
+ "solarized:base2": "solarized:base0",
+ "solarized:base3": "solarized:base1"
}
},
"i": {
"groups": {
- "background": { "fg": "oldlace", "bg": "darkgreencopper" },
- "background:divider": { "fg": "lightyellow", "bg": "darkgreencopper" },
- "mode": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] },
- "modified_indicator": { "fg": "yellow", "bg": "lightyellow", "attr": ["bold"] },
- "paste_indicator": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] },
- "readonly_indicator": { "fg": "red", "bg": "lightyellow" },
- "branch": { "fg": "darkgreencopper", "bg": "lightyellow" },
- "branch:divider": { "fg": "lightskyblue4", "bg": "lightyellow" },
- "file_directory": { "fg": "darkgreencopper", "bg": "lightyellow" },
- "file_name": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] },
- "file_size": { "fg": "royalblue5", "bg": "lightyellow" },
- "file_name_no_file": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] },
- "file_name_empty": { "fg": "royalblue5", "bg": "lightyellow" },
- "file_format": { "fg": "lightyellow", "bg": "darkgreencopper" },
- "file_encoding": { "fg": "lightyellow", "bg": "darkgreencopper" },
- "file_type": { "fg": "lightyellow", "bg": "darkgreencopper" },
- "file_vcs_status": { "fg": "red", "bg": "lightyellow" },
- "file_vcs_status_M": { "fg": "yellow", "bg": "lightyellow" },
- "file_vcs_status_A": { "fg": "green", "bg": "lightyellow" },
- "line_percent": { "fg": "oldlace", "bg": "gray61" },
- "line_percent_gradient": { "fg": "oldlace", "bg": "gray61" },
- "line_current": { "fg": "gray13", "bg": "oldlace", "attr": ["bold"] },
- "line_current_symbol": { "fg": "gray13", "bg": "oldlace" },
- "col_current": { "fg": "azure4", "bg": "oldlace" }
+ "background": { "fg": "solarized:base3", "bg": "solarized:base01", "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": [] }
}
},
"v": {
"groups": {
- "mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+ "mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
}
},
"V": {
"groups": {
- "mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+ "mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
}
},
"^V": {
"groups": {
- "mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+ "mode": { "fg": "solarized:base3", "bg": "solarized:orange", "attr": ["bold"] }
}
},
"R": {
"groups": {
- "mode": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }
+ "mode": { "fg": "solarized:base3", "bg": "solarized:red", "attr": ["bold"] }
}
}
}
diff --git a/config/.config/powerline/config.json b/config/.config/powerline/config.json
index e9a627e7..a5389b6c 100644
--- a/config/.config/powerline/config.json
+++ b/config/.config/powerline/config.json
@@ -1,17 +1,6 @@
{
"common": {
- "term_truecolor": false,
- "dividers": {
- "left": {
- "hard": " ",
- "soft": " "
- },
- "right": {
- "hard": " ",
- "soft": " "
- }
- },
- "spaces": 1
+ "term_truecolor": false
},
"ext": {
"ipython": {
@@ -25,7 +14,11 @@
},
"shell": {
"colorscheme": "default",
- "theme": "default"
+ "theme": "default",
+ "local_themes": {
+ "continuation": "continuation",
+ "select": "select"
+ }
},
"tmux": {
"colorscheme": "default",
@@ -35,14 +28,16 @@
"colorscheme": "default",
"theme": "default",
"local_themes": {
+ "__tabline__": "tabline",
+
"cmdwin": "cmdwin",
"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"
+ "powerline.matchers.vim.plugin.nerdtree.nerdtree": "plugin_nerdtree",
+ "powerline.matchers.vim.plugin.ctrlp.ctrlp": "plugin_ctrlp",
+ "powerline.matchers.vim.plugin.gundo.gundo": "plugin_gundo",
+ "powerline.matchers.vim.plugin.gundo.gundo_preview": "plugin_gundo-preview"
}
},
"wm": {
diff --git a/config/.config/powerline/themes/ipython/in.json b/config/.config/powerline/themes/ipython/in.json
index ac979c5f..6218b3ab 100644
--- a/config/.config/powerline/themes/ipython/in.json
+++ b/config/.config/powerline/themes/ipython/in.json
@@ -3,17 +3,17 @@
"segments": {
"left": [
{
- "name": "virtualenv"
+ "function": "virtualenv",
+ "priority": 10
},
{
"type": "string",
- "contents": "In[",
+ "contents": "In [",
"draw_soft_divider": false,
"highlight_group": ["prompt"]
},
{
- "name": "prompt_count",
- "module": "powerline.segments.ipython",
+ "function": "powerline.segments.ipython.prompt_count",
"draw_soft_divider": false
},
{
diff --git a/config/.config/powerline/themes/ipython/out.json b/config/.config/powerline/themes/ipython/out.json
index 11a63234..f7c27adf 100644
--- a/config/.config/powerline/themes/ipython/out.json
+++ b/config/.config/powerline/themes/ipython/out.json
@@ -1,5 +1,5 @@
{
- "default_module": "powerline.segments.common",
+ "default_module": "powerline.segments.ipython",
"segments": {
"left": [
{
@@ -11,8 +11,7 @@
"highlight_group": ["prompt"]
},
{
- "name": "prompt_count",
- "module": "powerline.segments.ipython",
+ "function": "prompt_count",
"draw_soft_divider": false
},
{
diff --git a/config/.config/powerline/themes/ipython/rewrite.json b/config/.config/powerline/themes/ipython/rewrite.json
index 47d8de0d..35b39024 100644
--- a/config/.config/powerline/themes/ipython/rewrite.json
+++ b/config/.config/powerline/themes/ipython/rewrite.json
@@ -1,4 +1,5 @@
{
+ "default_module": "powerline.segments.ipython",
"segments": {
"left": [
{
@@ -9,8 +10,7 @@
"highlight_group": ["prompt"]
},
{
- "name": "prompt_count",
- "module": "powerline.segments.ipython",
+ "function": "prompt_count",
"draw_soft_divider": false
},
{
diff --git a/config/.config/powerline/themes/shell/default.json b/config/.config/powerline/themes/shell/default.json
index 6246a964..6ba1ba6d 100644
--- a/config/.config/powerline/themes/shell/default.json
+++ b/config/.config/powerline/themes/shell/default.json
@@ -1,44 +1,39 @@
{
"default_module": "powerline.segments.common",
- "segment_data": {
- "hostname": {
- "before": " ",
- "args": {
- "only_if_ssh": true
- }
- },
- "virtualenv": {
- "before": "ⓔ "
- },
- "branch": {
- "before": " "
- }
- },
"segments": {
"left": [
{
- "name": "hostname"
+ "function": "powerline.segments.shell.mode"
+ },
+ {
+ "function": "hostname",
+ "priority": 10
+ },
+ {
+ "function": "user",
+ "priority": 30
},
{
- "name": "user"
+ "function": "virtualenv",
+ "priority": 50
},
{
- "name": "virtualenv"
+ "function": "powerline.segments.shell.cwd",
+ "priority": 10
},
{
- "name": "cwd",
- "args": {
- "dir_limit_depth": 3
- }
+ "function": "powerline.segments.shell.jobnum",
+ "priority": 20
}
],
"right": [
{
- "module": "powerline.segments.shell",
- "name": "last_pipe_status"
+ "function": "powerline.segments.shell.last_pipe_status",
+ "priority": 10
},
{
- "name": "branch"
+ "function": "branch",
+ "priority": 40
}
]
}
diff --git a/config/.config/powerline/themes/shell/default_leftonly.json b/config/.config/powerline/themes/shell/default_leftonly.json
index 16af9755..018847ba 100644
--- a/config/.config/powerline/themes/shell/default_leftonly.json
+++ b/config/.config/powerline/themes/shell/default_leftonly.json
@@ -1,42 +1,34 @@
{
"default_module": "powerline.segments.common",
- "segment_data": {
- "hostname": {
- "before": " ",
- "args": {
- "only_if_ssh": true
- }
- },
- "virtualenv": {
- "before": "ⓔ "
- },
- "branch": {
- "before": " "
- }
- },
"segments": {
"left": [
{
- "name": "hostname"
+ "function": "hostname",
+ "priority": 10
+ },
+ {
+ "function": "user",
+ "priority": 30
},
{
- "name": "user"
+ "function": "virtualenv",
+ "priority": 50
},
{
- "name": "virtualenv"
+ "function": "branch",
+ "priority": 40
},
{
- "name": "branch"
+ "function": "powerline.segments.shell.cwd",
+ "priority": 10
},
{
- "name": "cwd",
- "args": {
- "dir_limit_depth": 3
- }
+ "function": "powerline.segments.shell.jobnum",
+ "priority": 20
},
{
- "name": "last_status",
- "module": "powerline.segments.shell"
+ "function": "powerline.segments.shell.last_status",
+ "priority": 10
}
]
}
diff --git a/config/.config/powerline/themes/tmux/default.json b/config/.config/powerline/themes/tmux/default.json
index 241c4c43..780f34f2 100644
--- a/config/.config/powerline/themes/tmux/default.json
+++ b/config/.config/powerline/themes/tmux/default.json
@@ -1,11 +1,28 @@
{
"default_module": "powerline.segments.common",
- "segment_data": {
- },
"segments": {
"right": [
{
- "name": "hostname"
+ "function": "uptime",
+ "priority": 50
+ },
+ {
+ "function": "system_load",
+ "priority": 50
+ },
+ {
+ "function": "date"
+ },
+ {
+ "function": "date",
+ "name": "time",
+ "args": {
+ "format": "%H:%M",
+ "istime": true
+ }
+ },
+ {
+ "function": "hostname"
}
]
}
diff --git a/config/.config/powerline/themes/vim/default.json b/config/.config/powerline/themes/vim/default.json
index 5f10912d..a71c2136 100644
--- a/config/.config/powerline/themes/vim/default.json
+++ b/config/.config/powerline/themes/vim/default.json
@@ -1,73 +1,66 @@
{
- "segment_data": {
- "branch": {
- "before": " "
- },
- "modified_indicator": {
- "args": { "text": "+" }
- },
- "line_percent": {
- "args": { "gradient": true },
- "after": "%"
- },
- "line_current_symbol": {
- "contents": " "
- }
- },
"segments": {
"left": [
{
- "name": "mode",
+ "function": "mode",
"exclude_modes": ["nc"]
},
{
- "name": "visual_range",
- "exclude_modes": ["nc"],
+ "function": "visual_range",
+ "include_modes": ["v", "V", "^V", "s", "S", "^S"],
"priority": 10
},
{
- "name": "paste_indicator",
+ "function": "paste_indicator",
"exclude_modes": ["nc"],
"priority": 10
},
{
- "name": "branch",
+ "function": "branch",
"exclude_modes": ["nc"],
"priority": 30
},
{
- "name": "readonly_indicator",
+ "function": "readonly_indicator",
"draw_soft_divider": false,
"after": " "
},
{
- "name": "file_directory",
+ "function": "file_scheme",
+ "priority": 20
+ },
+ {
+ "function": "file_directory",
"priority": 40,
"draw_soft_divider": false
},
{
- "name": "file_name",
+ "function": "file_name",
"draw_soft_divider": false
},
{
- "name": "file_vcs_status",
+ "function": "file_vcs_status",
"before": " ",
"draw_soft_divider": false
},
{
- "name": "modified_indicator",
+ "function": "modified_indicator",
"before": " "
},
+ {
+ "exclude_modes": ["i", "R", "Rv"],
+ "function": "trailing_whitespace",
+ "display": false,
+ "priority": 60
+ },
{
"exclude_modes": ["nc"],
- "module": "powerline.segments.plugin.syntastic",
- "name": "syntastic",
+ "function": "powerline.segments.vim.plugin.syntastic.syntastic",
"priority": 50
},
{
"exclude_modes": ["nc"],
- "module": "powerline.segments.plugin.tagbar",
- "name": "current_tag",
+ "function": "powerline.segments.vim.plugin.tagbar.current_tag",
"draw_soft_divider": false,
"priority": 50
},
@@ -81,23 +74,23 @@
],
"right": [
{
- "name": "file_format",
+ "function": "file_format",
"draw_soft_divider": false,
"exclude_modes": ["nc"],
"priority": 60
},
{
- "name": "file_encoding",
+ "function": "file_encoding",
"exclude_modes": ["nc"],
"priority": 60
},
{
- "name": "file_type",
+ "function": "file_type",
"exclude_modes": ["nc"],
"priority": 60
},
{
- "name": "line_percent",
+ "function": "line_percent",
"priority": 50,
"width": 4,
"align": "r"
@@ -108,13 +101,13 @@
"highlight_group": ["line_current_symbol", "line_current"]
},
{
- "name": "line_current",
+ "function": "line_current",
"draw_soft_divider": false,
"width": 3,
"align": "r"
},
{
- "name": "virtcol_current",
+ "function": "virtcol_current",
"draw_soft_divider": false,
"priority": 20,
"before": ":",
diff --git a/config/.config/powerline/themes/vim/help.json b/config/.config/powerline/themes/vim/help.json
index 74071057..aef0c23e 100644
--- a/config/.config/powerline/themes/vim/help.json
+++ b/config/.config/powerline/themes/vim/help.json
@@ -2,7 +2,7 @@
"segments": {
"left": [
{
- "name": "file_name",
+ "function": "file_name",
"draw_soft_divider": false
},
{
@@ -15,7 +15,7 @@
],
"right": [
{
- "name": "line_percent",
+ "function": "line_percent",
"priority": 30,
"width": 4,
"align": "r"
@@ -26,7 +26,7 @@
"highlight_group": ["line_current_symbol", "line_current"]
},
{
- "name": "line_current",
+ "function": "line_current",
"draw_soft_divider": false,
"width": 3,
"align": "r"
diff --git a/config/.config/powerline/themes/vim/quickfix.json b/config/.config/powerline/themes/vim/quickfix.json
index da77d631..2aa1c0f1 100644
--- a/config/.config/powerline/themes/vim/quickfix.json
+++ b/config/.config/powerline/themes/vim/quickfix.json
@@ -9,7 +9,10 @@
{
"type": "string",
"name": "buffer_name",
- "highlight_group": ["file_name"],
+ "highlight_group": ["file_name"]
+ },
+ {
+ "function": "window_title",
"draw_soft_divider": false
},
{
@@ -27,7 +30,7 @@
"highlight_group": ["line_current_symbol", "line_current"]
},
{
- "name": "line_current",
+ "function": "line_current",
"draw_soft_divider": false,
"width": 3,
"align": "r"
diff --git a/config/.config/powerline/themes/wm/default.json b/config/.config/powerline/themes/wm/default.json
index c1cee4b7..009c4924 100644
--- a/config/.config/powerline/themes/wm/default.json
+++ b/config/.config/powerline/themes/wm/default.json
@@ -3,23 +3,22 @@
"segments": {
"right": [
{
- "name": "weather",
+ "function": "weather",
"priority": 50
},
{
- "name": "date"
+ "function": "date"
},
{
- "name": "date",
+ "function": "date",
+ "name": "time",
"args": {
"format": "%H:%M",
"istime": true
- },
- "before": "⌚ "
+ }
},
{
- "name": "email_imap_alert",
- "before": "✉ ",
+ "function": "email_imap_alert",
"priority": 10,
"args": {
"username": "",
diff --git a/src/powerline b/src/powerline
index 5f7fbda2..31ccd290 160000
--- a/src/powerline
+++ b/src/powerline
@@ -1 +1 @@
-Subproject commit 5f7fbda29ada28fd38cc910998509deae81bc380
+Subproject commit 31ccd2907a653888d7226cd2d46d729931ae3c35
diff --git a/src/tmux-colors-solarized b/src/tmux-colors-solarized
new file mode 160000
index 00000000..91c50cf6
--- /dev/null
+++ b/src/tmux-colors-solarized
@@ -0,0 +1 @@
+Subproject commit 91c50cf61112601307fec7124a7d7413480460ca
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index b559f262..5c8a7e2e 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -103,5 +103,5 @@ bind r source-file ~/.tmux.conf \; display 'Reloaded tmux.conf'
# TODO Figure out why this is order dependent
source-file ~/.tmux.conf.local
-set -g status-bg black
+source-file ~/.dotfiles/src/tmux-colors-solarized/tmuxcolors-256.conf
source-file ~/.dotfiles/src/powerline/powerline/bindings/tmux/powerline.conf