From abc9c5ef90cb54ca431fb6cb8234059370ef6ae5 Mon Sep 17 00:00:00 2001 From: pearofducks Date: Sat, 20 Apr 2013 21:14:32 +0200 Subject: [PATCH 1/4] Add a prefix to solarized color names Conflicts: powerline/config_files/colors.json powerline/config_files/colorschemes/shell/solarized.json powerline/config_files/colorschemes/vim/solarized.json --- powerline/config_files/colors.json | 17 ++ .../colorschemes/shell/solarized.json | 10 +- .../config_files/colorschemes/solarized.json | 26 +-- .../colorschemes/vim/solarized.json | 154 +++++++++--------- .../colorschemes/vim/solarizedlight.json | 154 +++++++++--------- 5 files changed, 189 insertions(+), 172 deletions(-) diff --git a/powerline/config_files/colors.json b/powerline/config_files/colors.json index 68b69f6e..ecd25277 100644 --- a/powerline/config_files/colors.json +++ b/powerline/config_files/colors.json @@ -64,6 +64,23 @@ "orange": [9, "cb4b16"], "yellow": [3, "b58900"], + "solarized:base03": [8, "002b36"], + "solarized:base02": [0, "073642"], + "solarized:base01": [10, "586e75"], + "solarized:base00": [11, "657b83"], + "solarized:base0": [12, "839496"], + "solarized:base1": [14, "93a1a1"], + "solarized:base2": [7, "eee8d5"], + "solarized:base3": [15, "fdf6e3"], + "solarized:yellow": [3, "b58900"], + "solarized:orange": [9, "cb4b16"], + "solarized:red": [1, "dc322f"], + "solarized:magenta": [5, "d33682"], + "solarized:violet": [13, "6c71c4"], + "solarized:blue": [4, "268bd2"], + "solarized:cyan": [6, "2aa198"], + "solarized:green": [2, "859900"], + "lightyellowgreen": 106, "gold3": 178, "orangered": 202, diff --git a/powerline/config_files/colorschemes/shell/solarized.json b/powerline/config_files/colorschemes/shell/solarized.json index e7f79569..e9059bd6 100644 --- a/powerline/config_files/colorschemes/shell/solarized.json +++ b/powerline/config_files/colorschemes/shell/solarized.json @@ -1,15 +1,15 @@ { "name": "Solarized dark for shell", "groups": { - "jobnum": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, - "exit_fail": { "fg": "oldlace", "bg": "red", "attr": [] }, - "exit_success": { "fg": "oldlace", "bg": "green", "attr": [] }, - "mode": { "fg": "oldlace", "bg": "green", "attr": ["bold"] } + "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": "oldlace", "bg": "blue", "attr": ["bold"] } + "mode": { "fg": "solarized:base3", "bg": "solarized:blue", "attr": ["bold"] } } } } diff --git a/powerline/config_files/colorschemes/solarized.json b/powerline/config_files/colorschemes/solarized.json index c01f2b43..9c015ccd 100644 --- a/powerline/config_files/colorschemes/solarized.json +++ b/powerline/config_files/colorschemes/solarized.json @@ -1,18 +1,18 @@ { "name": "Solarized dark", "groups": { - "background": { "fg": "oldlace", "bg": "royalblue5", "attr": [] }, - "user": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] }, - "superuser": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }, - "virtualenv": { "fg": "oldlace", "bg": "green", "attr": [] }, - "branch": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, - "branch_dirty": { "fg": "yellow", "bg": "royalblue5", "attr": [] }, - "branch_clean": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, - "cwd": { "fg": "lightyellow", "bg": "darkgreencopper", "attr": [] }, - "cwd:current_folder": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, - "cwd:divider": { "fg": "gray61", "bg": "darkgreencopper", "attr": [] }, - "hostname": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, - "environment": { "fg": "oldlace", "bg": "green", "attr": [] }, - "attached_clients": { "fg": "oldlace", "bg": "green", "attr": [] } + "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": [] } } } diff --git a/powerline/config_files/colorschemes/vim/solarized.json b/powerline/config_files/colorschemes/vim/solarized.json index 127ed78a..63038fbc 100644 --- a/powerline/config_files/colorschemes/vim/solarized.json +++ b/powerline/config_files/colorschemes/vim/solarized.json @@ -1,115 +1,115 @@ { "name": "Solarized dark for vim", "groups": { - "information:additional": { "fg": "lightyellow", "bg": "darkgreencopper", "attr": [] }, - "information:unimportant": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, - "background": { "fg": "oldlace", "bg": "royalblue5", "attr": [] }, - "background:divider": { "fg": "lightskyblue4", "bg": "royalblue5", "attr": [] }, - "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", "attr": [] }, - "branch_dirty": { "fg": "yellow", "bg": "darkgreencopper", "attr": [] }, - "branch:divider": { "fg": "gray61", "bg": "darkgreencopper", "attr": [] }, - "file_name": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, - "window_title": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, - "file_name_no_file": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, - "file_format": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, - "file_vcs_status": { "fg": "red", "bg": "darkgreencopper", "attr": [] }, - "file_vcs_status_M": { "fg": "yellow", "bg": "darkgreencopper", "attr": [] }, - "file_vcs_status_A": { "fg": "green", "bg": "darkgreencopper", "attr": [] }, - "line_percent": { "fg": "oldlace", "bg": "lightskyblue4", "attr": [] }, - "line_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "lightskyblue4", "attr": [] }, - "position": { "fg": "oldlace", "bg": "lightskyblue4", "attr": [] }, - "position_gradient": { "fg": "green_yellow_orange_red", "bg": "lightskyblue4", "attr": [] }, - "line_current": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] }, - "line_current_symbol": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, - "virtcol_current_gradient": { "fg": "GREEN_Orange_red", "bg": "lightyellow", "attr": [] }, - "col_current": { "fg": "azure4", "bg": "lightyellow", "attr": [] }, - "environment": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, - "attached_clients": { "fg": "gray61", "bg": "royalblue5", "attr": [] }, - "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": { - "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" } }, "buf_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" } }, "i": { "groups": { - "background": { "fg": "oldlace", "bg": "darkgreencopper", "attr": [] }, - "background:divider": { "fg": "lightyellow", "bg": "darkgreencopper", "attr": [] }, - "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", "attr": [] }, - "branch": { "fg": "darkgreencopper", "bg": "lightyellow", "attr": [] }, - "branch:divider": { "fg": "lightskyblue4", "bg": "lightyellow", "attr": [] }, - "file_directory": { "fg": "darkgreencopper", "bg": "lightyellow", "attr": [] }, - "file_name": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] }, - "file_size": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, - "file_name_no_file": { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] }, - "file_name_empty": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, - "file_format": { "fg": "lightyellow", "bg": "darkgreencopper", "attr": [] }, - "file_vcs_status": { "fg": "red", "bg": "lightyellow", "attr": [] }, - "file_vcs_status_M": { "fg": "yellow", "bg": "lightyellow", "attr": [] }, - "file_vcs_status_A": { "fg": "green", "bg": "lightyellow", "attr": [] }, - "line_percent": { "fg": "oldlace", "bg": "gray61", "attr": [] }, - "line_percent_gradient": { "fg": "oldlace", "bg": "gray61", "attr": [] }, - "position": { "fg": "oldlace", "bg": "gray61", "attr": [] }, - "position_gradient": { "fg": "oldlace", "bg": "gray61", "attr": [] }, - "line_current": { "fg": "gray13", "bg": "oldlace", "attr": ["bold"] }, - "line_current_symbol": { "fg": "gray13", "bg": "oldlace", "attr": [] }, - "col_current": { "fg": "azure4", "bg": "oldlace", "attr": [] } + "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/powerline/config_files/colorschemes/vim/solarizedlight.json b/powerline/config_files/colorschemes/vim/solarizedlight.json index cab94968..da38bb88 100644 --- a/powerline/config_files/colorschemes/vim/solarizedlight.json +++ b/powerline/config_files/colorschemes/vim/solarizedlight.json @@ -1,115 +1,115 @@ { "name": "Solarized light for vim", "groups": { - "information:additional": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, - "information:unimportant": { "fg": "gray61", "bg": "darkgreencopper", "attr": [] }, - "background": { "fg": "gray13", "bg": "darkgreencopper", "attr": [] }, - "background:divider": { "fg": "azure4", "bg": "darkgreencopper", "attr": [] }, - "mode": { "fg": "oldlace", "bg": "green", "attr": ["bold"] }, - "visual_range": { "fg": "green", "bg": "oldlace", "attr": ["bold"] }, - "modified_indicator": { "fg": "yellow", "bg": "lightyellow", "attr": ["bold"] }, - "paste_indicator": { "fg": "red", "bg": "lightyellow", "attr": ["bold"] }, - "readonly_indicator": { "fg": "red", "bg": "lightyellow", "attr": [] }, - "branch_dirty": { "fg": "yellow", "bg": "lightyellow", "attr": [] }, - "branch:divider": { "fg": "gray61", "bg": "lightyellow", "attr": [] }, - "file_name": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] }, - "window_title": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, - "file_size": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, - "file_name_no_file": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] }, - "file_name_empty": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, - "file_vcs_status": { "fg": "red", "bg": "lightyellow", "attr": [] }, - "file_vcs_status_M": { "fg": "yellow", "bg": "lightyellow", "attr": [] }, - "file_vcs_status_A": { "fg": "green", "bg": "lightyellow", "attr": [] }, - "line_percent": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, - "line_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "lightyellow", "attr": [] }, - "position": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, - "position_gradient": { "fg": "green_yellow_orange_red", "bg": "lightyellow", "attr": [] }, - "line_current": { "fg": "oldlace", "bg": "royalblue5", "attr": ["bold"] }, - "line_current_symbol": { "fg": "oldlace", "bg": "royalblue5", "attr": [] }, - "virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "royalblue5", "attr": [] }, - "col_current": { "fg": "lightskyblue4", "bg": "royalblue5", "attr": [] }, - "error": { "fg": "gray13", "bg": "red", "attr": ["bold"] }, - "warning": { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] }, - "current_tag": { "fg": "gray13", "bg": "darkgreencopper", "attr": ["bold"] } + "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"] } }, "mode_translations": { "nc": { "colors": { - "lightyellow": "darkgreencopper", - "azure4": "darkgreencopper", - "lightskyblue4": "lightyellow", - "gray61": "azure4", - "royalblue5": "lightskyblue4", - "gray13": "gray61" + "solarized:base2": "solarized:base01", + "solarized:base0": "solarized:base01", + "solarized:base00": "solarized:base2", + "solarized:base1": "solarized:base0", + "solarized:base02": "solarized:base00", + "solarized:base03": "solarized:base1" } }, "tab_nc": { "colors": { - "lightyellow": "darkgreencopper", - "azure4": "darkgreencopper", - "lightskyblue4": "lightyellow", - "gray61": "azure4", - "royalblue5": "lightskyblue4", - "gray13": "gray61" + "solarized:base2": "solarized:base01", + "solarized:base0": "solarized:base01", + "solarized:base00": "solarized:base2", + "solarized:base1": "solarized:base0", + "solarized:base02": "solarized:base00", + "solarized:base03": "solarized:base1" } }, "buf_nc": { "colors": { - "lightyellow": "darkgreencopper", - "azure4": "darkgreencopper", - "lightskyblue4": "lightyellow", - "gray61": "azure4", - "royalblue5": "lightskyblue4", - "gray13": "gray61" + "solarized:base2": "solarized:base01", + "solarized:base0": "solarized:base01", + "solarized:base00": "solarized:base2", + "solarized:base1": "solarized:base0", + "solarized:base02": "solarized:base00", + "solarized:base03": "solarized:base1" } }, "i": { "groups": { - "background": { "fg": "gray13", "bg": "lightyellow", "attr": [] }, - "background:divider": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, - "mode": { "fg": "oldlace", "bg": "blue", "attr": ["bold"] }, - "modified_indicator": { "fg": "yellow", "bg": "royalblue5", "attr": ["bold"] }, - "paste_indicator": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }, - "readonly_indicator": { "fg": "red", "bg": "royalblue5", "attr": [] }, - "branch": { "fg": "lightyellow", "bg": "royalblue5", "attr": [] }, - "branch:divider": { "fg": "azure4", "bg": "royalblue5", "attr": [] }, - "file_directory": { "fg": "lightyellow", "bg": "royalblue5", "attr": [] }, - "file_name": { "fg": "darkgreencopper", "bg": "royalblue5", "attr": ["bold"] }, - "file_size": { "fg": "darkgreencopper", "bg": "royalblue5", "attr": [] }, - "file_name_no_file": { "fg": "darkgreencopper", "bg": "royalblue5", "attr": ["bold"] }, - "file_name_empty": { "fg": "darkgreencopper", "bg": "royalblue5", "attr": [] }, - "file_format": { "fg": "royalblue5", "bg": "lightyellow", "attr": [] }, - "file_vcs_status": { "fg": "red", "bg": "royalblue5", "attr": [] }, - "file_vcs_status_M": { "fg": "yellow", "bg": "royalblue5", "attr": [] }, - "file_vcs_status_A": { "fg": "green", "bg": "royalblue5", "attr": [] }, - "line_percent": { "fg": "gray13", "bg": "gray61", "attr": [] }, - "line_percent_gradient": { "fg": "gray13", "bg": "gray61", "attr": [] }, - "position": { "fg": "gray13", "bg": "gray61", "attr": [] }, - "position_gradient": { "fg": "gray13", "bg": "gray61", "attr": [] }, - "line_current": { "fg": "oldlace", "bg": "gray13", "attr": ["bold"] }, - "line_current_symbol": { "fg": "oldlace", "bg": "gray13", "attr": [] }, - "virtcol_current_gradient": { "fg": "yellow_orange_red", "bg": "gray13", "attr": [] }, - "col_current": { "fg": "lightskyblue4", "bg": "gray13", "attr": [] } + "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": [] } } }, "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"] } } } } From a70ec39a1f63d38fb5e9317f0f5a164ce7c2d08b Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 24 Aug 2014 21:55:13 +0400 Subject: [PATCH 2/4] Make powerline-lint support `id:id` groups --- powerline/lint/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/powerline/lint/__init__.py b/powerline/lint/__init__.py index d9eb1112..f495cc18 100644 --- a/powerline/lint/__init__.py +++ b/powerline/lint/__init__.py @@ -315,9 +315,9 @@ class Spec(object): def ident(self, msg_func=None): msg_func = ( msg_func - or (lambda value: 'String "{0}" is not an alphanumeric/underscore identifier'.format(value)) + or (lambda value: 'String "{0}" is not an alphanumeric/underscore colon-separated identifier'.format(value)) ) - return self.re('^\w+$', msg_func) + return self.re('^\w+(?::\w+)?$', msg_func) def oneof(self, collection, msg_func=None): msg_func = msg_func or (lambda value: '"{0}" must be one of {1!r}'.format(value, list(collection))) @@ -701,7 +701,7 @@ def check_group(group, data, context, echoerr): color_spec = Spec().type(unicode).func(check_color).copy name_spec = Spec().type(unicode).len('gt', 0).optional().copy -group_name_spec = Spec().re('^\w+(?::\w+)?$').copy +group_name_spec = Spec().ident().copy group_spec = Spec().either(Spec( fg=color_spec(), bg=color_spec(), From 9d63fb42d1d4f5275fb7b7634b26fed38f997b06 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 24 Aug 2014 22:00:36 +0400 Subject: [PATCH 3/4] Remove unneeded colors --- powerline/config_files/colors.json | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/powerline/config_files/colors.json b/powerline/config_files/colors.json index ecd25277..31ce92d3 100644 --- a/powerline/config_files/colors.json +++ b/powerline/config_files/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"], - "solarized:base03": [8, "002b36"], "solarized:base02": [0, "073642"], "solarized:base01": [10, "586e75"], From 407014417fe5c2557c5e8bea048b0b0a412a3577 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 24 Aug 2014 22:01:10 +0400 Subject: [PATCH 4/4] Move solarized colors below other colors --- powerline/config_files/colors.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/powerline/config_files/colors.json b/powerline/config_files/colors.json index 31ce92d3..6bfadf7b 100644 --- a/powerline/config_files/colors.json +++ b/powerline/config_files/colors.json @@ -46,6 +46,15 @@ "gray9": 250, "gray10": 252, + "lightyellowgreen": 106, + "gold3": 178, + "orangered": 202, + + "steelblue": 67, + "darkorange3": 166, + "skyblue1": 117, + "khaki1": 228, + "solarized:base03": [8, "002b36"], "solarized:base02": [0, "073642"], "solarized:base01": [10, "586e75"], @@ -61,16 +70,7 @@ "solarized:violet": [13, "6c71c4"], "solarized:blue": [4, "268bd2"], "solarized:cyan": [6, "2aa198"], - "solarized:green": [2, "859900"], - - "lightyellowgreen": 106, - "gold3": 178, - "orangered": 202, - - "steelblue": 67, - "darkorange3": 166, - "skyblue1": 117, - "khaki1": 228 + "solarized:green": [2, "859900"] }, "gradients": { "dark_GREEN_Orange_red": [