From e79eada2a0c2a409ada97bd8ebccce61afb33f5d Mon Sep 17 00:00:00 2001 From: ZyX Date: Wed, 5 Feb 2014 08:56:26 +0400 Subject: [PATCH] Move some color defintions to colorscheme/*.json --- .../config_files/colorschemes/default.json | 42 +++++++++++++++++++ .../colorschemes/ipython/default.json | 5 +-- .../colorschemes/shell/__main__.json | 6 +++ .../colorschemes/shell/default.json | 23 +++------- .../colorschemes/shell/solarized.json | 23 +++------- .../config_files/colorschemes/solarized.json | 17 ++++++++ .../colorschemes/tmux/default.json | 32 -------------- .../colorschemes/vim/solarized.json | 2 +- .../colorschemes/vim/solarizedlight.json | 2 +- .../config_files/colorschemes/wm/default.json | 26 ------------ 10 files changed, 80 insertions(+), 98 deletions(-) create mode 100644 powerline/config_files/colorschemes/default.json create mode 100644 powerline/config_files/colorschemes/shell/__main__.json create mode 100644 powerline/config_files/colorschemes/solarized.json delete mode 100644 powerline/config_files/colorschemes/tmux/default.json delete mode 100644 powerline/config_files/colorschemes/wm/default.json diff --git a/powerline/config_files/colorschemes/default.json b/powerline/config_files/colorschemes/default.json new file mode 100644 index 00000000..77bec02d --- /dev/null +++ b/powerline/config_files/colorschemes/default.json @@ -0,0 +1,42 @@ +{ + "name": "Default", + "groups": { + "background:divider": { "fg": "gray5", "bg": "gray0" }, + "session": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, + "date": { "fg": "gray8", "bg": "gray2" }, + "time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] }, + "time:divider": { "fg": "gray5", "bg": "gray2" }, + "email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] }, + "email_alert_gradient": { "fg": "white", "bg": "yellow_orange_red", "attr": ["bold"] }, + "hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, + "weather": { "fg": "gray8", "bg": "gray0" }, + "weather_temp_gradient": { "fg": "blue_red", "bg": "gray0" }, + "weather_condition_hot": { "fg": "khaki1", "bg": "gray0" }, + "weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" }, + "weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" }, + "uptime": { "fg": "gray8", "bg": "gray0" }, + "external_ip": { "fg": "gray8", "bg": "gray0" }, + "network_load": { "fg": "gray8", "bg": "gray0" }, + "network_load_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" }, + "system_load": { "fg": "gray8", "bg": "gray0" }, + "system_load_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" }, + "environment": { "fg": "gray8", "bg": "gray0" }, + "cpu_load_percent": { "fg": "gray8", "bg": "gray0" }, + "cpu_load_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" }, + "battery": { "fg": "gray8", "bg": "gray0" }, + "battery_gradient": { "fg": "white_red", "bg": "gray0" }, + "battery_full": { "fg": "red", "bg": "gray0" }, + "battery_empty": { "fg": "white", "bg": "gray0" }, + "now_playing": { "fg": "gray10", "bg": "black" }, + "user": { "fg": "white", "bg": "darkblue", "attr": ["bold"] }, + "superuser": { "fg": "white", "bg": "brightred", "attr": ["bold"] }, + "branch": { "fg": "gray9", "bg": "gray2" }, + "branch_dirty": { "fg": "brightyellow", "bg": "gray2" }, + "branch_clean": { "fg": "gray9", "bg": "gray2" }, + "branch:divider": { "fg": "gray7", "bg": "gray2" }, + "cwd": { "fg": "gray9", "bg": "gray4" }, + "cwd:current_folder": { "fg": "gray10", "bg": "gray4", "attr": ["bold"] }, + "cwd:divider": { "fg": "gray7", "bg": "gray4" }, + "virtualenv": { "fg": "white", "bg": "darkcyan" } + } +} diff --git a/powerline/config_files/colorschemes/ipython/default.json b/powerline/config_files/colorschemes/ipython/default.json index d7875916..60585c0d 100644 --- a/powerline/config_files/colorschemes/ipython/default.json +++ b/powerline/config_files/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" }, + "prompt_count": { "fg": "white", "bg": "gray4" } } } diff --git a/powerline/config_files/colorschemes/shell/__main__.json b/powerline/config_files/colorschemes/shell/__main__.json new file mode 100644 index 00000000..c8c2aaa2 --- /dev/null +++ b/powerline/config_files/colorschemes/shell/__main__.json @@ -0,0 +1,6 @@ +{ + "groups": { + "continuation": "cwd", + "continuation:current": "cwd:current_folder" + } +} diff --git a/powerline/config_files/colorschemes/shell/default.json b/powerline/config_files/colorschemes/shell/default.json index 2efd3796..46483940 100644 --- a/powerline/config_files/colorschemes/shell/default.json +++ b/powerline/config_files/colorschemes/shell/default.json @@ -1,23 +1,12 @@ { "name": "Default color scheme for shell prompts", "groups": { - "jobnum": { "fg": "brightyellow", "bg": "mediumorange" }, - "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" }, - "continuation": { "fg": "gray9", "bg": "gray4" }, - "continuation:current": { "fg": "gray10", "bg": "gray4", "attr": ["bold"] }, - "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" }, - "mode": { "fg": "darkestgreen", "bg": "brightgreen", "attr": ["bold"] } + "hostname": { "fg": "brightyellow", "bg": "mediumorange" }, + "jobnum": { "fg": "brightyellow", "bg": "mediumorange" }, + "exit_fail": { "fg": "white", "bg": "darkestred" }, + "exit_success": { "fg": "white", "bg": "darkestgreen" }, + "environment": { "fg": "white", "bg": "darkestgreen" }, + "mode": { "fg": "darkestgreen", "bg": "brightgreen", "attr": ["bold"] } }, "mode_translations": { "vicmd": { diff --git a/powerline/config_files/colorschemes/shell/solarized.json b/powerline/config_files/colorschemes/shell/solarized.json index 612941d0..2916940a 100644 --- a/powerline/config_files/colorschemes/shell/solarized.json +++ b/powerline/config_files/colorschemes/shell/solarized.json @@ -1,23 +1,10 @@ { - "name": "Solarized Dark", + "name": "Solarized dark for shell", "groups": { - "jobnum": { "fg": "oldlace", "bg": "darkgreencopper" }, - "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" }, - "continuation": { "fg": "lightyellow", "bg": "darkgreencopper" }, - "continuation:current": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] }, - "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" }, - "mode": { "fg": "oldlace", "bg": "green", "attr": ["bold"] } + "jobnum": { "fg": "oldlace", "bg": "darkgreencopper" }, + "exit_fail": { "fg": "oldlace", "bg": "red" }, + "exit_success": { "fg": "oldlace", "bg": "green" }, + "mode": { "fg": "oldlace", "bg": "green", "attr": ["bold"] } }, "mode_translations": { "vicmd": { diff --git a/powerline/config_files/colorschemes/solarized.json b/powerline/config_files/colorschemes/solarized.json new file mode 100644 index 00000000..3e901e50 --- /dev/null +++ b/powerline/config_files/colorschemes/solarized.json @@ -0,0 +1,17 @@ +{ + "name": "Solarized dark", + "groups": { + "background": { "fg": "oldlace", "bg": "royalblue5" }, + "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" }, + "environment": { "fg": "oldlace", "bg": "green" } + } +} diff --git a/powerline/config_files/colorschemes/tmux/default.json b/powerline/config_files/colorschemes/tmux/default.json deleted file mode 100644 index 20b122d7..00000000 --- a/powerline/config_files/colorschemes/tmux/default.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "Default color scheme for terminal prompts", - "groups": { - "background:divider": { "fg": "gray5", "bg": "gray0" }, - "session": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, - "date": { "fg": "gray8", "bg": "gray2" }, - "time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] }, - "time:divider": { "fg": "gray5", "bg": "gray2" }, - "email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] }, - "email_alert_gradient": { "fg": "white", "bg": "yellow_orange_red", "attr": ["bold"] }, - "hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, - "weather": { "fg": "gray8", "bg": "gray0" }, - "weather_temp_gradient": { "fg": "blue_red", "bg": "gray0" }, - "weather_condition_hot": { "fg": "khaki1", "bg": "gray0" }, - "weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" }, - "weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" }, - "uptime": { "fg": "gray8", "bg": "gray0" }, - "external_ip": { "fg": "gray8", "bg": "gray0" }, - "network_load": { "fg": "gray8", "bg": "gray0" }, - "network_load_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" }, - "system_load": { "fg": "gray8", "bg": "gray0" }, - "system_load_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" }, - "cpu_load_percent": { "fg": "gray8", "bg": "gray0" }, - "cpu_load_percent_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" }, - "battery_full": { "fg": "red", "bg": "gray0" }, - "battery_empty": { "fg": "white", "bg": "gray0" }, - "now_playing": { "fg": "gray10", "bg": "black" } - } -} diff --git a/powerline/config_files/colorschemes/vim/solarized.json b/powerline/config_files/colorschemes/vim/solarized.json index 4822573e..0ea4fd39 100644 --- a/powerline/config_files/colorschemes/vim/solarized.json +++ b/powerline/config_files/colorschemes/vim/solarized.json @@ -1,5 +1,5 @@ { - "name": "Solarized Dark", + "name": "Solarized dark for vim", "groups": { "background": { "fg": "oldlace", "bg": "royalblue5" }, "background:divider": { "fg": "lightskyblue4", "bg": "royalblue5" }, diff --git a/powerline/config_files/colorschemes/vim/solarizedlight.json b/powerline/config_files/colorschemes/vim/solarizedlight.json index b8e4c254..2622cb1a 100644 --- a/powerline/config_files/colorschemes/vim/solarizedlight.json +++ b/powerline/config_files/colorschemes/vim/solarizedlight.json @@ -1,5 +1,5 @@ { - "name": "Solarized Light", + "name": "Solarized light for vim", "groups": { "background": { "fg": "gray13", "bg": "darkgreencopper" }, "background:divider": { "fg": "azure4", "bg": "darkgreencopper" }, diff --git a/powerline/config_files/colorschemes/wm/default.json b/powerline/config_files/colorschemes/wm/default.json deleted file mode 100644 index 445da4f6..00000000 --- a/powerline/config_files/colorschemes/wm/default.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "Default color scheme for window managers", - "groups": { - "background:divider": { "fg": "gray5", "bg": "gray0" }, - "session": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, - "date": { "fg": "gray8", "bg": "gray2" }, - "time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] }, - "time:divider": { "fg": "gray5", "bg": "gray2" }, - "email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] }, - "email_alert_gradient": { "fg": "white", "bg": "yellow_orange_red", "attr": ["bold"] }, - "hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, - "weather": { "fg": "gray8", "bg": "gray0" }, - "weather_temp_gradient": { "fg": "blue_red", "bg": "gray0" }, - "weather_condition_hot": { "fg": "khaki1", "bg": "gray0" }, - "weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" }, - "weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" }, - "uptime": { "fg": "gray8", "bg": "gray0" }, - "external_ip": { "fg": "gray8", "bg": "gray0" }, - "network_load": { "fg": "gray8", "bg": "gray0" }, - "system_load": { "fg": "gray8", "bg": "gray0" }, - "system_load_good": { "fg": "lightyellowgreen", "bg": "gray0" }, - "system_load_bad": { "fg": "gold3", "bg": "gray0" }, - "system_load_ugly": { "fg": "orangered", "bg": "gray0" }, - "environment": { "fg": "gray8", "bg": "gray0" } - } -}