From 3e727bf4cd882825070be6453ce58afa1e492257 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 10 Nov 2014 17:30:34 -0800 Subject: [PATCH] Modernize powerline. Make powerline colors simple so that they can be set with terminal settings. --- dotfiles/config/powerline/colors.json | 2 +- .../powerline/colorschemes/tmux/default.json | 49 +++--- .../config/powerline/themes/tmux/default.json | 12 +- dotfiles/emacs.d | 2 +- dotfiles/tmux.conf | 5 +- dotfiles/tmux.powerline | 7 +- resources/com.googlecode.iterm2.plist | 142 +++++++++--------- tasks/__init__.py | 1 + 8 files changed, 111 insertions(+), 109 deletions(-) diff --git a/dotfiles/config/powerline/colors.json b/dotfiles/config/powerline/colors.json index 1bcd85ed..d481e673 100644 --- a/dotfiles/config/powerline/colors.json +++ b/dotfiles/config/powerline/colors.json @@ -1,6 +1,5 @@ { "colors": { - "black": 16, "white": 231, "darkestgreen": 22, @@ -63,6 +62,7 @@ "violet": [13, "6c71c4"], "orange": [9, "cb4b16"], "yellow": [3, "b58900"], + "black": [0, "000000"], "lightyellowgreen": 106, "gold3": 178, diff --git a/dotfiles/config/powerline/colorschemes/tmux/default.json b/dotfiles/config/powerline/colorschemes/tmux/default.json index 1a594b0f..25a28932 100644 --- a/dotfiles/config/powerline/colorschemes/tmux/default.json +++ b/dotfiles/config/powerline/colorschemes/tmux/default.json @@ -1,30 +1,29 @@ { "name": "Default color scheme for terminal prompts", "groups": { - "global": { "fg": "darkestred", "bg": "gray0" }, - "window_status_left": { "fg": "gray10", "bg": "gray0" }, - "window_status_right": { "fg": "gray10", "bg": "gray0" }, - "current_window_status_left": { "fg": "gray10", "bg": "darkestred" }, - "current_window_status_right": { "fg": "gray10", "bg": "darkblue" }, - "background:divider": { "fg": "darkestred", "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" }, - "uptime": { "fg": "gray8", "bg": "darkestpurple" }, - "external_ip": { "fg": "black", "bg": "red" }, - "system_load": { "fg": "gray8", "bg": "brightred" }, - "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" }, - "test": { "fg": "gray10", "bg": "black" }, - "battery_gradient": { "fg": "white_red", "bg": "gray0" }, - "now_playing": { "fg": "gray10", "bg": "black" } + "window_status_left": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "window_status_right": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "current_window_status_left": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "current_window_status_right": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "background:divider": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "session": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "date": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "time": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "time:divider": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "email_alert": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "email_alert_gradient": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "hostname": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "weather": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "uptime": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "external_ip": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "system_load": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "system_load_gradient": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "cpu_load_percent": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "cpu_load_percent_gradient": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "environment": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "battery": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "test": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "battery_gradient": { "fg": "blue", "bg": "black", "attr": ["bold"] }, + "now_playing": { "fg": "blue", "bg": "black", "attr": ["bold"] } } } diff --git a/dotfiles/config/powerline/themes/tmux/default.json b/dotfiles/config/powerline/themes/tmux/default.json index d0f4a981..a60589e2 100644 --- a/dotfiles/config/powerline/themes/tmux/default.json +++ b/dotfiles/config/powerline/themes/tmux/default.json @@ -11,30 +11,30 @@ "segments": { "right": [ { - "name": "system_load", + "function": "system_load", "priority": 50 }, { - "name": "uptime", + "function": "uptime", "priority": 50 }, { - "name": "date", + "function": "date", "args": { "format": "%H:%M", "istime": true } }, { - "name": "external_ip" + "function": "external_ip" }, { - "name": "hostname" + "function": "hostname" } ], "special": [ { - "name": "window_status", + "function": "window_status", "type": "string", "contnets": "#I" } diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d index 85427a46..7f514ddb 160000 --- a/dotfiles/emacs.d +++ b/dotfiles/emacs.d @@ -1 +1 @@ -Subproject commit 85427a46d26b435a151074af80576c231015b2a5 +Subproject commit 7f514ddb5c5e3f4b24da9402ec7fd09d4ddbacf4 diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf index 6e592574..cd2fc8ed 100644 --- a/dotfiles/tmux.conf +++ b/dotfiles/tmux.conf @@ -8,9 +8,8 @@ set-option -g status on bind-key @ command-prompt -p "create pane from:" "join-pane -s ':%%'" bind-key ^ command-prompt -p "swap window:,with window:" "swap-window -s %1 -t %2" - -set-option -g status-fg colour255 -set-option -g status-bg colour235 +set-option -g status-fg blue +set-option -g status-bg black set-option -g status-interval 2 set-option -g status-utf8 on set-option -g status-justify "centre" diff --git a/dotfiles/tmux.powerline b/dotfiles/tmux.powerline index 466fb950..d9325ed9 100644 --- a/dotfiles/tmux.powerline +++ b/dotfiles/tmux.powerline @@ -6,9 +6,8 @@ set -g status-justify left set -g status-left-length 150 set -g status-right-length 150 set -g status-right '#(eval $POWERLINE_COMMAND tmux right -R pane_id=`tmux display -p "#D"`)' -set -g window-status-format "#[fg=colour244,bg=colour234]#I #[fg=colour240] #[default]#W " -set -g window-status-current-format "#[fg=colour234,bg=colour31]#[fg=colour117,bg=colour31] #I  #[fg=colour231,bold]#W #[fg=colour31,bg=colour234,nobold]" -set-window-option -g window-status-fg colour249 +set -g window-status-format "#[fg=white] #[fg=white,bg=black]#I #[fg=white] #[default]#W " +set -g window-status-current-format "#[fg=black,bg=blue]#[fg=white,bg=blue] #I  #[fg=white,bold]#W #[fg=blue,bg=black,nobold]" +set-window-option -g window-status-fg white set-window-option -g window-status-activity-attr none set-window-option -g window-status-activity-fg yellow -# vim: ft=tmux diff --git a/resources/com.googlecode.iterm2.plist b/resources/com.googlecode.iterm2.plist index 01649b50..39a9d70f 100644 --- a/resources/com.googlecode.iterm2.plist +++ b/resources/com.googlecode.iterm2.plist @@ -5264,14 +5264,18 @@ NSWindow Frame NSColorPanel 1180 103 231 329 0 0 1440 877 + NSWindow Frame NSFontPanel + 665 68 712 432 0 0 1440 877 NSWindow Frame Preferences - 401 345 924 485 0 0 1440 877 + 401 365 924 485 0 0 1440 900 NSWindow Frame SUStatusFrame 528 562 384 129 0 0 1440 878 NSWindow Frame UKCrashReporter 99 294 592 584 0 0 1440 878 NSWindow Frame iTerm Window 0 - 722 465 570 401 0 0 1440 877 + 637 472 570 401 0 0 1440 877 + NSWindow Frame iTerm Window 1 + 183 118 570 351 0 0 1440 877 New Bookmarks @@ -5284,146 +5288,146 @@ Ansi 0 Color Blue Component - 0.0 + 0.19370138645172119 Green Component - 0.0 + 0.15575926005840302 Red Component 0.0 Ansi 1 Color Blue Component - 0.18431372940540314 + 0.14145714044570923 Green Component - 0.19607843458652496 + 0.10840655118227005 Red Component - 0.86274510622024536 + 0.81926977634429932 Ansi 10 Color Blue Component - 0.22745098173618317 + 0.38298487663269043 Green Component - 0.85882353782653809 + 0.35665956139564514 Red Component - 0.33725491166114807 + 0.27671992778778076 Ansi 11 Color Blue Component - 0.0 + 0.43850564956665039 Green Component - 0.51764708757400513 + 0.40717673301696777 Red Component - 1 + 0.32436618208885193 Ansi 12 Color Blue Component - 0.83137255907058716 + 0.51685798168182373 Green Component - 0.51764708757400513 + 0.50962930917739868 Red Component - 0.0 + 0.44058024883270264 Ansi 13 Color Blue Component - 0.85098040103912354 + 0.72908437252044678 Green Component - 0.16078431904315948 + 0.33896297216415405 Red Component - 0.71764707565307617 + 0.34798634052276611 Ansi 14 Color Blue Component - 1 + 0.56363654136657715 Green Component - 0.80000001192092896 + 0.56485837697982788 Red Component - 0.80000001192092896 + 0.50599193572998047 Ansi 15 Color Blue Component - 1 + 0.86405980587005615 Green Component - 1 + 0.95794391632080078 Red Component - 1 + 0.98943418264389038 Ansi 2 Color Blue Component - 0.22745098173618317 + 0.020208755508065224 Green Component - 0.85882353782653809 + 0.54115492105484009 Red Component - 0.33725491166114807 + 0.44977453351020813 Ansi 3 Color Blue Component - 0.0 + 0.023484811186790466 Green Component - 0.51764708757400513 + 0.46751424670219421 Red Component - 1 + 0.64746475219726562 Ansi 4 Color Blue Component - 0.83137255907058716 + 0.78231418132781982 Green Component - 0.51764708757400513 + 0.46265947818756104 Red Component - 0.0 + 0.12754884362220764 Ansi 5 Color Blue Component - 0.85098040103912354 + 0.43516635894775391 Green Component - 0.16078431904315948 + 0.10802463442087173 Red Component - 0.71764707565307617 + 0.77738940715789795 Ansi 6 Color Blue Component - 1 + 0.52502274513244629 Green Component - 0.80000001192092896 + 0.57082360982894897 Red Component - 0.80000001192092896 + 0.14679534733295441 Ansi 7 Color Blue Component - 1 + 0.79781103134155273 Green Component - 1 + 0.89001238346099854 Red Component - 1 + 0.91611063480377197 Ansi 8 Color Blue Component - 0.12941177189350128 + 0.15170273184776306 Green Component - 0.11372549086809158 + 0.11783610284328461 Red Component - 0.10588235408067703 + 0.0 Ansi 9 Color Blue Component - 0.18431372940540314 + 0.073530435562133789 Green Component - 0.19607843458652496 + 0.21325300633907318 Red Component - 0.86274510622024536 + 0.74176257848739624 Automatically Log @@ -5432,9 +5436,9 @@ Background Color Blue Component - 0.0 + 0.15170273184776306 Green Component - 0.0 + 0.11783610284328461 Red Component 0.0 @@ -5455,11 +5459,11 @@ Bold Color Blue Component - 0.0 + 0.56363654136657715 Green Component - 0.51764708757400513 + 0.56485837697982788 Red Component - 1 + 0.50599193572998047 Character Encoding 4 @@ -5472,20 +5476,20 @@ Cursor Color Blue Component - 0.18431372940540314 + 0.51685798168182373 Green Component - 0.19607843458652496 + 0.50962930917739868 Red Component - 0.86274510622024536 + 0.44058024883270264 Cursor Text Color Blue Component - 1 + 0.19370138645172119 Green Component - 1 + 0.15575926005840302 Red Component - 1 + 0.0 Cursor Type 2 @@ -5506,11 +5510,11 @@ Foreground Color Blue Component - 1 + 0.51685798168182373 Green Component - 1 + 0.50962930917739868 Red Component - 1 + 0.44058024883270264 Guid 3314520D-1E49-4605-AFCE-EA48A596636F @@ -5852,20 +5856,20 @@ Selected Text Color Blue Component - 1 + 0.56363654136657715 Green Component - 1 + 0.56485837697982788 Red Component - 1 + 0.50599193572998047 Selection Color Blue Component - 0.25882354378700256 + 0.19370138645172119 Green Component - 0.21176470816135406 + 0.15575926005840302 Red Component - 0.027450980618596077 + 0.0 Semantic History diff --git a/tasks/__init__.py b/tasks/__init__.py index 36505435..74169254 100644 --- a/tasks/__init__.py +++ b/tasks/__init__.py @@ -37,6 +37,7 @@ def dotfiles(ctx, flags=''): @ctask def powerline(ctx): + ctx.run('sudo pip install psutil') ctx.run('sudo pip install git+git://github.com/Lokaltog/powerline')