wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

Modernize powerline. Make powerline colors simple so that they can be set with terminal settings.

Browse Source
This commit is contained in:
Ivan Malison 2014-11-10 17:30:34 -08:00
parent 5898641e11
commit 3e727bf4cd
8 changed files with 111 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dotfiles/config/powerline/colors.json
View File

@ -1,6 +1,5 @@
{ {
"colors": { "colors": {
"black": 16,
"white": 231, "white": 231,
"darkestgreen": 22, "darkestgreen": 22,
@ -63,6 +62,7 @@
"violet": [13, "6c71c4"], "violet": [13, "6c71c4"],
"orange": [9, "cb4b16"], "orange": [9, "cb4b16"],
"yellow": [3, "b58900"], "yellow": [3, "b58900"],
"black": [0, "000000"],
"lightyellowgreen": 106, "lightyellowgreen": 106,
"gold3": 178, "gold3": 178,

49
dotfiles/config/powerline/colorschemes/tmux/default.json
View File

@ -1,30 +1,29 @@
{ {
"name": "Default color scheme for terminal prompts", "name": "Default color scheme for terminal prompts",
"groups": { "groups": {
"global": { "fg": "darkestred", "bg": "gray0" }, "window_status_left": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"window_status_left": { "fg": "gray10", "bg": "gray0" }, "window_status_right": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"window_status_right": { "fg": "gray10", "bg": "gray0" }, "current_window_status_left": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"current_window_status_left": { "fg": "gray10", "bg": "darkestred" }, "current_window_status_right": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"current_window_status_right": { "fg": "gray10", "bg": "darkblue" }, "background:divider": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"background:divider": { "fg": "darkestred", "bg": "gray0" }, "session": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"session": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, "date": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"date": { "fg": "gray8", "bg": "gray2" }, "time": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] }, "time:divider": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"time:divider": { "fg": "gray5", "bg": "gray2" }, "email_alert": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] }, "email_alert_gradient": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"email_alert_gradient": { "fg": "white", "bg": "yellow_orange_red", "attr": ["bold"] }, "hostname": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] }, "weather": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"weather": { "fg": "gray8", "bg": "gray0" }, "uptime": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"uptime": { "fg": "gray8", "bg": "darkestpurple" }, "external_ip": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"external_ip": { "fg": "black", "bg": "red" }, "system_load": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"system_load": { "fg": "gray8", "bg": "brightred" }, "system_load_gradient": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"system_load_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" }, "cpu_load_percent": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"cpu_load_percent": { "fg": "gray8", "bg": "gray0" }, "cpu_load_percent_gradient": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"cpu_load_percent_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" }, "environment": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"environment": { "fg": "gray8", "bg": "gray0" }, "battery": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"battery": { "fg": "gray8", "bg": "gray0" }, "test": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"test": { "fg": "gray10", "bg": "black" }, "battery_gradient": { "fg": "blue", "bg": "black", "attr": ["bold"] },
"battery_gradient": { "fg": "white_red", "bg": "gray0" }, "now_playing": { "fg": "blue", "bg": "black", "attr": ["bold"] }
"now_playing": { "fg": "gray10", "bg": "black" }
} }
} }

12
dotfiles/config/powerline/themes/tmux/default.json
View File

@ -11,30 +11,30 @@
"segments": { "segments": {
"right": [ "right": [
{ {
"name": "system_load", "function": "system_load",
"priority": 50 "priority": 50
}, },
{ {
"name": "uptime", "function": "uptime",
"priority": 50 "priority": 50
}, },
{ {
"name": "date", "function": "date",
"args": { "args": {
"format": "%H:%M", "format": "%H:%M",
"istime": true "istime": true
} }
}, },
{ {
"name": "external_ip" "function": "external_ip"
}, },
{ {
"name": "hostname" "function": "hostname"
} }
], ],
"special": [ "special": [
{ {
"name": "window_status", "function": "window_status",
"type": "string", "type": "string",
"contnets": "#I" "contnets": "#I"
} }

2
dotfiles/emacs.d

@ -1 +1 @@
Subproject commit 85427a46d26b435a151074af80576c231015b2a5 Subproject commit 7f514ddb5c5e3f4b24da9402ec7fd09d4ddbacf4

5
dotfiles/tmux.conf
View File

@ -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 "create pane from:" "join-pane -s ':%%'"
bind-key ^ command-prompt -p "swap window:,with window:" "swap-window -s %1 -t %2" bind-key ^ command-prompt -p "swap window:,with window:" "swap-window -s %1 -t %2"
set-option -g status-fg blue
set-option -g status-fg colour255 set-option -g status-bg black
set-option -g status-bg colour235
set-option -g status-interval 2 set-option -g status-interval 2
set-option -g status-utf8 on set-option -g status-utf8 on
set-option -g status-justify "centre" set-option -g status-justify "centre"

7
dotfiles/tmux.powerline
View File

@ -6,9 +6,8 @@ set -g status-justify left
set -g status-left-length 150 set -g status-left-length 150
set -g status-right-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 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-format "#[fg=white] #[fg=white,bg=black]#I #[fg=white] #[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 -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 colour249 set-window-option -g window-status-fg white
set-window-option -g window-status-activity-attr none set-window-option -g window-status-activity-attr none
set-window-option -g window-status-activity-fg yellow set-window-option -g window-status-activity-fg yellow
# vim: ft=tmux

142
resources/com.googlecode.iterm2.plist
View File

@ -5264,14 +5264,18 @@
</dict> </dict>
<key>NSWindow Frame NSColorPanel</key> <key>NSWindow Frame NSColorPanel</key>
<string>1180 103 231 329 0 0 1440 877 </string> <string>1180 103 231 329 0 0 1440 877 </string>
<key>NSWindow Frame NSFontPanel</key>
<string>665 68 712 432 0 0 1440 877 </string>
<key>NSWindow Frame Preferences</key> <key>NSWindow Frame Preferences</key>
<string>401 345 924 485 0 0 1440 877 </string> <string>401 365 924 485 0 0 1440 900 </string>
<key>NSWindow Frame SUStatusFrame</key> <key>NSWindow Frame SUStatusFrame</key>
<string>528 562 384 129 0 0 1440 878 </string> <string>528 562 384 129 0 0 1440 878 </string>
<key>NSWindow Frame UKCrashReporter</key> <key>NSWindow Frame UKCrashReporter</key>
<string>99 294 592 584 0 0 1440 878 </string> <string>99 294 592 584 0 0 1440 878 </string>
<key>NSWindow Frame iTerm Window 0</key> <key>NSWindow Frame iTerm Window 0</key>
<string>722 465 570 401 0 0 1440 877 </string> <string>637 472 570 401 0 0 1440 877 </string>
<key>NSWindow Frame iTerm Window 1</key>
<string>183 118 570 351 0 0 1440 877 </string>
<key>New Bookmarks</key> <key>New Bookmarks</key>
<array> <array>
<dict> <dict>
@ -5284,146 +5288,146 @@
<key>Ansi 0 Color</key> <key>Ansi 0 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.0</real> <real>0.19370138645172119</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.0</real> <real>0.15575926005840302</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.0</real> <real>0.0</real>
</dict> </dict>
<key>Ansi 1 Color</key> <key>Ansi 1 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.18431372940540314</real> <real>0.14145714044570923</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.19607843458652496</real> <real>0.10840655118227005</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.86274510622024536</real> <real>0.81926977634429932</real>
</dict> </dict>
<key>Ansi 10 Color</key> <key>Ansi 10 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.22745098173618317</real> <real>0.38298487663269043</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.85882353782653809</real> <real>0.35665956139564514</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.33725491166114807</real> <real>0.27671992778778076</real>
</dict> </dict>
<key>Ansi 11 Color</key> <key>Ansi 11 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.0</real> <real>0.43850564956665039</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.51764708757400513</real> <real>0.40717673301696777</real>
<key>Red Component</key> <key>Red Component</key>
<real>1</real> <real>0.32436618208885193</real>
</dict> </dict>
<key>Ansi 12 Color</key> <key>Ansi 12 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.83137255907058716</real> <real>0.51685798168182373</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.51764708757400513</real> <real>0.50962930917739868</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.0</real> <real>0.44058024883270264</real>
</dict> </dict>
<key>Ansi 13 Color</key> <key>Ansi 13 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.85098040103912354</real> <real>0.72908437252044678</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.16078431904315948</real> <real>0.33896297216415405</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.71764707565307617</real> <real>0.34798634052276611</real>
</dict> </dict>
<key>Ansi 14 Color</key> <key>Ansi 14 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>1</real> <real>0.56363654136657715</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.80000001192092896</real> <real>0.56485837697982788</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.80000001192092896</real> <real>0.50599193572998047</real>
</dict> </dict>
<key>Ansi 15 Color</key> <key>Ansi 15 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>1</real> <real>0.86405980587005615</real>
<key>Green Component</key> <key>Green Component</key>
<real>1</real> <real>0.95794391632080078</real>
<key>Red Component</key> <key>Red Component</key>
<real>1</real> <real>0.98943418264389038</real>
</dict> </dict>
<key>Ansi 2 Color</key> <key>Ansi 2 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.22745098173618317</real> <real>0.020208755508065224</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.85882353782653809</real> <real>0.54115492105484009</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.33725491166114807</real> <real>0.44977453351020813</real>
</dict> </dict>
<key>Ansi 3 Color</key> <key>Ansi 3 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.0</real> <real>0.023484811186790466</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.51764708757400513</real> <real>0.46751424670219421</real>
<key>Red Component</key> <key>Red Component</key>
<real>1</real> <real>0.64746475219726562</real>
</dict> </dict>
<key>Ansi 4 Color</key> <key>Ansi 4 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.83137255907058716</real> <real>0.78231418132781982</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.51764708757400513</real> <real>0.46265947818756104</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.0</real> <real>0.12754884362220764</real>
</dict> </dict>
<key>Ansi 5 Color</key> <key>Ansi 5 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.85098040103912354</real> <real>0.43516635894775391</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.16078431904315948</real> <real>0.10802463442087173</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.71764707565307617</real> <real>0.77738940715789795</real>
</dict> </dict>
<key>Ansi 6 Color</key> <key>Ansi 6 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>1</real> <real>0.52502274513244629</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.80000001192092896</real> <real>0.57082360982894897</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.80000001192092896</real> <real>0.14679534733295441</real>
</dict> </dict>
<key>Ansi 7 Color</key> <key>Ansi 7 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>1</real> <real>0.79781103134155273</real>
<key>Green Component</key> <key>Green Component</key>
<real>1</real> <real>0.89001238346099854</real>
<key>Red Component</key> <key>Red Component</key>
<real>1</real> <real>0.91611063480377197</real>
</dict> </dict>
<key>Ansi 8 Color</key> <key>Ansi 8 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.12941177189350128</real> <real>0.15170273184776306</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.11372549086809158</real> <real>0.11783610284328461</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.10588235408067703</real> <real>0.0</real>
</dict> </dict>
<key>Ansi 9 Color</key> <key>Ansi 9 Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.18431372940540314</real> <real>0.073530435562133789</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.19607843458652496</real> <real>0.21325300633907318</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.86274510622024536</real> <real>0.74176257848739624</real>
</dict> </dict>
<key>Automatically Log</key> <key>Automatically Log</key>
<false/> <false/>
@ -5432,9 +5436,9 @@
<key>Background Color</key> <key>Background Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.0</real> <real>0.15170273184776306</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.0</real> <real>0.11783610284328461</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.0</real> <real>0.0</real>
</dict> </dict>
@ -5455,11 +5459,11 @@
<key>Bold Color</key> <key>Bold Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.0</real> <real>0.56363654136657715</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.51764708757400513</real> <real>0.56485837697982788</real>
<key>Red Component</key> <key>Red Component</key>
<real>1</real> <real>0.50599193572998047</real>
</dict> </dict>
<key>Character Encoding</key> <key>Character Encoding</key>
<integer>4</integer> <integer>4</integer>
@ -5472,20 +5476,20 @@
<key>Cursor Color</key> <key>Cursor Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.18431372940540314</real> <real>0.51685798168182373</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.19607843458652496</real> <real>0.50962930917739868</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.86274510622024536</real> <real>0.44058024883270264</real>
</dict> </dict>
<key>Cursor Text Color</key> <key>Cursor Text Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>1</real> <real>0.19370138645172119</real>
<key>Green Component</key> <key>Green Component</key>
<real>1</real> <real>0.15575926005840302</real>
<key>Red Component</key> <key>Red Component</key>
<real>1</real> <real>0.0</real>
</dict> </dict>
<key>Cursor Type</key> <key>Cursor Type</key>
<integer>2</integer> <integer>2</integer>
@ -5506,11 +5510,11 @@
<key>Foreground Color</key> <key>Foreground Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>1</real> <real>0.51685798168182373</real>
<key>Green Component</key> <key>Green Component</key>
<real>1</real> <real>0.50962930917739868</real>
<key>Red Component</key> <key>Red Component</key>
<real>1</real> <real>0.44058024883270264</real>
</dict> </dict>
<key>Guid</key> <key>Guid</key>
<string>3314520D-1E49-4605-AFCE-EA48A596636F</string> <string>3314520D-1E49-4605-AFCE-EA48A596636F</string>
@ -5852,20 +5856,20 @@
<key>Selected Text Color</key> <key>Selected Text Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>1</real> <real>0.56363654136657715</real>
<key>Green Component</key> <key>Green Component</key>
<real>1</real> <real>0.56485837697982788</real>
<key>Red Component</key> <key>Red Component</key>
<real>1</real> <real>0.50599193572998047</real>
</dict> </dict>
<key>Selection Color</key> <key>Selection Color</key>
<dict> <dict>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.25882354378700256</real> <real>0.19370138645172119</real>
<key>Green Component</key> <key>Green Component</key>
<real>0.21176470816135406</real> <real>0.15575926005840302</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.027450980618596077</real> <real>0.0</real>
</dict> </dict>
<key>Semantic History</key> <key>Semantic History</key>
<dict> <dict>

1
tasks/__init__.py
View File

@ -37,6 +37,7 @@ def dotfiles(ctx, flags=''):
@ctask @ctask
def powerline(ctx): def powerline(ctx):
ctx.run('sudo pip install psutil')
ctx.run('sudo pip install git+git://github.com/Lokaltog/powerline') ctx.run('sudo pip install git+git://github.com/Lokaltog/powerline')