Use the newer powerline.

diff --git a/ben-prose.zsh-theme b/ben-prose.zsh-theme
index 3573c24ae00a8139982fa4f60d9773e67ed6e5c4..dc21546404bf72d420faf8eb5cde8d3f11db13de 100644 (file)
--- a/ben-prose.zsh-theme
+++ b/ben-prose.zsh-theme
@@ -6,14 +6,6 @@ function rvm_info {
   echo '('`rvm-prompt`') '
 }
 
   echo '('`rvm-prompt`') '
 }
 

-function hg_prompt_info {
-    $OH_MY_ZSH_HG prompt --angle-brackets "\
-< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
-< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
-%{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}<
-patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
-}
-

 function box_name {
     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
 }
 function box_name {
     [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
 }


@@ -28,7 +20,7 @@ zle -N zle-line-init
 zle -N zle-keymap-select
 
 PROMPT='
 zle -N zle-keymap-select
 
 PROMPT='

-%{$fg[red]%}%n%{$reset_color%} at %{$fg[yellow]%}$(box_name)%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(hg_prompt_info)$(git_prompt_info) %{$fg[black]%}$(rvm_info)%{$reset_color%}
+%{$fg[red]%}%n%{$reset_color%} at %{$fg[yellow]%}$(box_name)%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) %{$fg[black]%}$(rvm_info)%{$reset_color%}

 %(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )$ '
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[blue]%}"
 %(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )$ '
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[blue]%}"

diff --git a/config/mc/ini b/config/mc/ini
new file mode 100644 (file)
index 0000000..ce20bb3
--- /dev/null
+++ b/config/mc/ini
@@ -0,0 +1,141 @@
+
+[Midnight-Commander]
+verbose=1
+pause_after_run=1
+shell_patterns=1
+auto_save_setup=1
+auto_menu=0
+use_internal_view=1
+use_internal_edit=1
+clear_before_exec=1
+confirm_delete=1
+confirm_overwrite=1
+confirm_execute=0
+confirm_history_cleanup=1
+confirm_exit=1
+confirm_directory_hotlist_delete=1
+safe_delete=0
+mouse_repeat_rate=100
+double_click_speed=250
+use_8th_bit_as_meta=0
+confirm_view_dir=0
+mouse_move_pages_viewer=1
+mouse_close_dialog=0
+fast_refresh=0
+drop_menus=0
+wrap_mode=1
+old_esc_mode=0
+old_esc_mode_timeout=1000000
+cd_symlinks=1
+show_all_if_ambiguous=0
+max_dirt_limit=10
+use_file_to_guess_type=1
+alternate_plus_minus=0
+only_leading_plus_minus=1
+show_output_starts_shell=0
+xtree_mode=0
+num_history_items_recorded=60
+file_op_compute_totals=1
+classic_progressbar=1
+vfs_timeout=60
+ftpfs_directory_timeout=900
+use_netrc=1
+ftpfs_retry_seconds=30
+ftpfs_always_use_proxy=0
+ftpfs_use_passive_connections=1
+ftpfs_use_passive_connections_over_proxy=0
+ftpfs_use_unix_list_options=1
+ftpfs_first_cd_then_ls=1
+fish_directory_timeout=900
+editor_tab_spacing=8
+editor_word_wrap_line_length=72
+editor_fill_tabs_with_spaces=0
+editor_return_does_auto_indent=1
+editor_backspace_through_tabs=0
+editor_fake_half_tabs=1
+editor_option_save_mode=0
+editor_option_save_position=1
+editor_option_auto_para_formatting=0
+editor_option_typewriter_wrap=0
+editor_edit_confirm_save=1
+editor_syntax_highlighting=1
+editor_persistent_selections=1
+editor_cursor_beyond_eol=0
+editor_visible_tabs=1
+editor_visible_spaces=1
+editor_line_state=0
+editor_simple_statusbar=0
+editor_check_new_line=0
+editor_show_right_margin=0
+editor_group_undo=0
+nice_rotating_dash=1
+mcview_remember_file_position=0
+auto_fill_mkdir_name=1
+copymove_persistent_attr=1
+select_flags=6
+editor_backup_extension=~
+mcview_eof=
+ignore_ftp_chattr_errors=true
+keymap=mc.keymap
+skin=default
+
+preallocate_space=0
+
+
+
+[Layout]
+message_visible=1
+keybar_visible=1
+xterm_title=1
+output_lines=0
+command_prompt=1
+menubar_visible=1
+free_space=1
+
+horizontal_split=0
+vertical_equal=1
+left_panel_size=72
+horizontal_equal=1
+top_panel_size=67
+
+
+
+[Misc]
+timeformat_recent=%b %e %H:%M
+timeformat_old=%b %e  %Y
+ftp_proxy_host=gate
+ftpfs_password=anonymous@
+display_codepage=UTF-8
+source_codepage=Other_8_bit
+autodetect_codeset=
+clipboard_store=
+clipboard_paste=
+
+[Colors]
+base_color=
+screen-256color=
+color_terminals=
+
+[Panels]
+show_mini_info=true
+kilobyte_si=false
+mix_all_files=false
+show_backups=true
+show_dot_files=true
+fast_reload=false
+fast_reload_msg_shown=false
+mark_moves_down=true
+reverse_files_only=true
+auto_save_setup_panels=false
+navigate_with_arrows=false
+panel_scroll_pages=true
+mouse_move_pages=true
+filetype_mode=true
+permission_mode=false
+torben_fj_mode=false
+quick_search_mode=2
+
+[Panelize]
+Find *.orig after patching=find . -name \\*.orig -print
+Find SUID and SGID programs=find . \\( \\( -perm -04000 -a -perm +011 \\) -o \\( -perm -02000 -a -perm +01 \\) \\) -print
+Find rejects after patching=find . -name \\*.rej -print

diff --git a/config/mc/panels.ini b/config/mc/panels.ini
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/config/mc/panels.ini
@@ -0,0 +1 @@
+

diff --git a/config/powerline/colors.json b/config/powerline/colors.json
new file mode 100644 (file)
index 0000000..3bbb90f
--- /dev/null
+++ b/config/powerline/colors.json
@@ -0,0 +1,98 @@
+{
+       "colors": {
+               "black": 16,
+               "white": 231,
+
+               "darkestgreen": 22,
+               "darkgreen": 28,
+               "mediumgreen": 70,
+               "brightgreen": 148,
+
+               "darkestcyan": 23,
+               "darkcyan": 74,
+               "mediumcyan": 117,
+               "brightcyan": 159,
+
+               "darkestblue": 24,
+               "darkblue": 31,
+
+               "darkestred": 52,
+               "darkred": 88,
+               "mediumred": 124,
+               "brightred": 160,
+               "brightestred": 196,
+
+               "darkestpurple": 55,
+               "mediumpurple": 98,
+               "brightpurple": 189,
+
+               "darkorange": 94,
+               "mediumorange": 166,
+               "brightorange": 208,
+               "brightestorange": 214,
+
+               "brightyellow": 220,
+
+               "gray0": 233,
+               "gray1": 235,
+               "gray2": 236,
+               "gray3": 239,
+               "gray4": 240,
+               "gray5": 241,
+               "gray6": 244,
+               "gray7": 245,
+               "gray8": 247,
+               "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,
+
+               "steelblue": 67,
+               "darkorange3": 166,
+               "skyblue1": 117,
+               "khaki1": 228
+       },
+       "gradients": {
+               "green_yellow_red": [
+                       [190, 184, 178, 172, 166, 160],
+                       ["8ae71c", "8ce71c", "8fe71c", "92e71c", "95e71d", "98e71d", "9ae71d", "9de71d", "a0e71e", "a3e71e", "a6e71e", "a8e71e", "abe71f", "aee71f", "b1e71f", "b4e71f", "b6e720", "b9e720", "bce720", "bfe720", "c2e821", "c3e721", "c5e621", "c7e521", "c9e522", "cbe422", "cde322", "cfe222", "d1e223", "d3e123", "d5e023", "d7df23", "d9df24", "dbde24", "dddd24", "dfdc24", "e1dc25", "e3db25", "e5da25", "e7d925", "e9d926", "e9d626", "e9d426", "e9d126", "e9cf27", "e9cc27", "e9ca27", "e9c727", "e9c528", "e9c228", "e9c028", "e9bd28", "e9bb29", "e9b829", "e9b629", "e9b329", "e9b12a", "e9ae2a", "e9ac2a", "e9a92a", "eaa72b", "eaa42b", "eaa22b", "ea9f2b", "ea9d2c", "ea9b2c", "ea982c", "ea962c", "ea942d", "ea912d", "ea8f2d", "ea8d2d", "ea8a2e", "ea882e", "ea862e", "ea832e", "ea812f", "ea7f2f", "ea7c2f", "ea7a2f", "eb7830", "eb7530", "eb7330", "eb7130", "eb6f31", "eb6c31", "eb6a31", "eb6831", "eb6632", "eb6332", "eb6132", "eb5f32", "eb5d33", "eb5a33", "eb5833", "eb5633", "eb5434", "eb5134", "eb4f34", "eb4d34", "ec4b35"]
+               ],
+               "green_yellow_orange_red": [
+                       [2, 3, 9, 1],
+                       ["719e07", "739d06", "759c06", "779c06", "799b06", "7b9a05", "7d9a05", "7f9905", "819805", "839805", "859704", "879704", "899604", "8b9504", "8d9504", "8f9403", "919303", "949303", "969203", "989102", "9a9102", "9c9002", "9e9002", "a08f02", "a28e01", "a48e01", "a68d01", "a88c01", "aa8c01", "ac8b00", "ae8a00", "b08a00", "b28900", "b58900", "b58700", "b68501", "b78302", "b78102", "b87f03", "b97d04", "b97b04", "ba7905", "bb7806", "bb7606", "bc7407", "bd7208", "bd7008", "be6e09", "bf6c0a", "bf6a0a", "c0690b", "c1670c", "c1650c", "c2630d", "c3610e", "c35f0e", "c45d0f", "c55b10", "c55a10", "c65811", "c75612", "c75412", "c85213", "c95014", "c94e14", "ca4c15", "cb4b16", "cb4a16", "cc4917", "cc4818", "cd4719", "cd4719", "ce461a", "ce451b", "cf441c", "cf441c", "d0431d", "d0421e", "d1411f", "d1411f", "d24020", "d23f21", "d33e22", "d33e22", "d43d23", "d43c24", "d53b25", "d53b25", "d63a26", "d63927", "d73828", "d73828", "d83729", "d8362a", "d9352b", "d9352b", "da342c", "da332d", "db322e", "dc322f"]
+               ],
+               "yellow_red": [
+                       [220, 178, 172, 166, 160],
+                       ["ffd700", "fdd500", "fbd300", "fad200", "f8d000", "f7cf00", "f5cd00", "f3cb00", "f2ca00", "f0c800", "efc700", "edc500", "ebc300", "eac200", "e8c000", "e7bf00", "e5bd00", "e3bb00", "e2ba00", "e0b800", "dfb700", "ddb500", "dbb300", "dab200", "d8b000", "d7af00", "d7ad00", "d7ab00", "d7aa00", "d7a800", "d7a700", "d7a500", "d7a300", "d7a200", "d7a000", "d79f00", "d79d00", "d79b00", "d79a00", "d79800", "d79700", "d79500", "d79300", "d79200", "d79000", "d78f00", "d78d00", "d78b00", "d78a00", "d78800", "d78700", "d78500", "d78300", "d78200", "d78000", "d77f00", "d77d00", "d77b00", "d77a00", "d77800", "d77700", "d77500", "d77300", "d77200", "d77000", "d76f00", "d76d00", "d76b00", "d76a00", "d76800", "d76700", "d76500", "d76300", "d76200", "d76000", "d75f00", "d75b00", "d75700", "d75300", "d74f00", "d74c00", "d74800", "d74400", "d74000", "d73c00", "d73900", "d73500", "d73100", "d72d00", "d72900", "d72600", "d72200", "d71e00", "d71a00", "d71600", "d71300", "d70f00", "d70b00", "d70700"]
+               ],
+               "yellow_orange_red": [
+                       [3, 9, 1],
+                       ["b58900", "b58700", "b58600", "b68501", "b68401", "b78202", "b78102", "b88003", "b87f03", "b87d03", "b97c04", "b97b04", "ba7a05", "ba7805", "bb7706", "bb7606", "bc7507", "bc7307", "bc7207", "bd7108", "bd7008", "be6e09", "be6d09", "bf6c0a", "bf6b0a", "c06a0b", "c0680b", "c0670b", "c1660c", "c1650c", "c2630d", "c2620d", "c3610e", "c3600e", "c35e0e", "c45d0f", "c45c0f", "c55b10", "c55910", "c65811", "c65711", "c75612", "c75412", "c75312", "c85213", "c85113", "c94f14", "c94e14", "ca4d15", "ca4c15", "cb4b16", "cb4a16", "cb4a17", "cc4917", "cc4918", "cc4818", "cd4819", "cd4719", "cd471a", "ce461a", "ce461b", "ce451b", "cf451c", "cf441c", "cf441d", "d0431d", "d0431e", "d0421e", "d1421f", "d1411f", "d14120", "d24020", "d24021", "d23f21", "d33f22", "d33e22", "d33e23", "d43d23", "d43d24", "d43c24", "d53c25", "d53b25", "d53b26", "d63a26", "d63a27", "d63927", "d73928", "d73828", "d73829", "d83729", "d8372a", "d8362a", "d9362b", "d9352b", "d9352c", "da342c", "da342d", "da332d", "db332e"]
+               ],
+               "blue_red": [
+                       [39, 74, 68, 67, 103, 97, 96, 132, 131, 167, 203, 197],
+                       ["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"]
+               ]
+       }
+}

diff --git a/config/powerline/colorschemes/ipython/default.json b/config/powerline/colorschemes/ipython/default.json
new file mode 100644 (file)
index 0000000..d787591
--- /dev/null
+++ b/config/powerline/colorschemes/ipython/default.json
@@ -0,0 +1,8 @@
+{
+       "name": "Default color scheme for IPython prompt",
+       "groups": {
+               "virtualenv": { "fg": "white", "bg": "darkcyan" },
+               "prompt": { "fg": "gray9", "bg": "gray4" },
+               "prompt_count": { "fg": "white", "bg": "gray4" }
+       }
+}

diff --git a/config/powerline/colorschemes/shell/default.json b/config/powerline/colorschemes/shell/default.json
new file mode 100644 (file)
index 0000000..639c1f9
--- /dev/null
+++ b/config/powerline/colorschemes/shell/default.json
@@ -0,0 +1,17 @@
+{
+       "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" }
+       }
+}

diff --git a/config/powerline/colorschemes/shell/solarized.json b/config/powerline/colorschemes/shell/solarized.json
new file mode 100644 (file)
index 0000000..5bf8672
--- /dev/null
+++ b/config/powerline/colorschemes/shell/solarized.json
@@ -0,0 +1,17 @@
+{
+       "name": "Solarized Dark",
+       "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" }
+       }
+}

diff --git a/config/powerline/colorschemes/tmux/default.json b/config/powerline/colorschemes/tmux/default.json
new file mode 100644 (file)
index 0000000..35686d3
--- /dev/null
+++ b/config/powerline/colorschemes/tmux/default.json
@@ -0,0 +1,24 @@
+{
+       "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" }
+       }
+}

diff --git a/config/powerline/colorschemes/vim/default.json b/config/powerline/colorschemes/vim/default.json
new file mode 100644 (file)
index 0000000..ec15879
--- /dev/null
+++ b/config/powerline/colorschemes/vim/default.json
@@ -0,0 +1,94 @@
+{
+       "name": "Default color scheme",
+       "groups": {
+               "background": { "fg": "white", "bg": "gray2" },
+               "background:divider": { "fg": "gray6", "bg": "gray2" },
+               "mode": { "fg": "darkestgreen", "bg": "brightgreen", "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" },
+               "file_name": { "fg": "white", "bg": "gray4", "attr": ["bold"] },
+               "file_size": { "fg": "gray8", "bg": "gray2" },
+               "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" },
+               "line_current": { "fg": "gray1", "bg": "gray10", "attr": ["bold"] },
+               "line_current_symbol": { "fg": "gray1", "bg": "gray10" },
+               "col_current": { "fg": "gray6", "bg": "gray10" },
+               "modified_buffers": { "fg": "brightyellow", "bg": "gray2" }
+       },
+       "mode_translations": {
+               "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",
+                               "green_yellow_red": "gray5"
+                       }
+               },
+               "i": {
+                       "colors": {
+                               "gray0": "darkestblue",
+                               "gray1": "darkestblue",
+                               "gray2": "darkestblue",
+                               "gray3": "darkblue",
+                               "gray4": "darkblue",
+                               "gray5": "darkestcyan",
+                               "gray6": "darkestcyan",
+                               "gray7": "darkestcyan",
+                               "gray8": "mediumcyan",
+                               "gray9": "mediumcyan",
+                               "gray10": "mediumcyan",
+                               "green_yellow_red": "gray5"
+                       },
+                       "groups": {
+                               "mode": { "fg": "darkestcyan", "bg": "white", "attr": ["bold"] },
+                               "background:divider": { "fg": "darkcyan", "bg": "darkestblue" },
+                               "branch:divider": { "fg": "darkcyan", "bg": "darkblue" }
+                       }
+               },
+               "v": {
+                       "groups": {
+                               "mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
+                       }
+               },
+               "V": {
+                       "groups": {
+                               "mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
+                       }
+               },
+               "^V": {
+                       "groups": {
+                               "mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
+                       }
+               },
+               "R": {
+                       "groups": {
+                               "mode": { "fg": "white", "bg": "brightred", "attr": ["bold"] }
+                       }
+               }
+       }
+}

diff --git a/config/powerline/colorschemes/vim/solarized.json b/config/powerline/colorschemes/vim/solarized.json
new file mode 100644 (file)
index 0000000..2eb4c36
--- /dev/null
+++ b/config/powerline/colorschemes/vim/solarized.json
@@ -0,0 +1,91 @@
+{
+       "name": "Solarized Dark",
+       "groups": {
+               "background":             { "fg": "oldlace", "bg": "royalblue5" },
+               "background:divider":     { "fg": "lightskyblue4", "bg": "royalblue5" },
+               "mode":                   { "fg": "oldlace", "bg": "green", "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" },
+               "col_current":            { "fg": "azure4", "bg": "lightyellow" }
+       },
+       "mode_translations": {
+               "nc": {
+                       "colors": {
+                               "darkgreencopper": "royalblue5",
+                               "lightskyblue4": "royalblue5",
+                               "azure4": "darkgreencopper",
+                               "gray61": "lightskyblue4",
+                               "lightyellow": "azure4",
+                               "oldlace": "gray61"
+                       }
+               },
+               "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" }
+                       }
+               },
+               "v": {
+                       "groups": {
+                               "mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+                       }
+               },
+               "V": {
+                       "groups": {
+                               "mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+                       }
+               },
+               "^V": {
+                       "groups": {
+                               "mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
+                       }
+               },
+               "R": {
+                       "groups": {
+                               "mode": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }
+                       }
+               }
+       }
+}

diff --git a/config/powerline/colorschemes/wm/default.json b/config/powerline/colorschemes/wm/default.json
new file mode 100644 (file)
index 0000000..d71d4e3
--- /dev/null
+++ b/config/powerline/colorschemes/wm/default.json
@@ -0,0 +1,25 @@
+{
+       "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" }
+       }
+}

diff --git a/config/powerline/config.json b/config/powerline/config.json
new file mode 100644 (file)
index 0000000..a70922f
--- /dev/null
+++ b/config/powerline/config.json
@@ -0,0 +1,48 @@
+{
+       "common": {
+               "term_truecolor": false,
+               "dividers": {
+                       "left": {
+                               "hard": " ",
+                               "soft": " "
+                       },
+                       "right": {
+                               "hard": " ",
+                               "soft": " "
+                       }
+               },
+               "spaces": 1
+       },
+       "ext": {
+               "ipython": {
+                       "colorscheme": "default",
+                       "theme": "in",
+                       "local_themes": {
+                               "rewrite": "rewrite",
+                               "out": "out",
+                               "in2": "in2"
+                       }
+               },
+               "shell": {
+                       "colorscheme": "default",
+                       "theme": "default"
+               },
+               "tmux": {
+                       "colorscheme": "default",
+                       "theme": "default"
+               },
+               "vim": {
+                       "colorscheme": "default",
+                       "theme": "default",
+                       "local_themes": {
+                               "cmdwin": "cmdwin",
+                               "help": "help",
+                               "quickfix": "quickfix"
+                       }
+               },
+               "wm": {
+                       "colorscheme": "default",
+                       "theme": "default"
+               }
+       }
+}

diff --git a/config/powerline/themes/ipython/in.json b/config/powerline/themes/ipython/in.json
new file mode 100644 (file)
index 0000000..ac979c5
--- /dev/null
+++ b/config/powerline/themes/ipython/in.json
@@ -0,0 +1,26 @@
+{
+       "default_module": "powerline.segments.common",
+       "segments": {
+               "left": [
+                       {
+                               "name": "virtualenv"
+                       },
+                       {
+                               "type": "string",
+                               "contents": "In[",
+                               "draw_soft_divider": false,
+                               "highlight_group": ["prompt"]
+                       },
+                       {
+                               "name": "prompt_count",
+                               "module": "powerline.segments.ipython",
+                               "draw_soft_divider": false
+                       },
+                       {
+                               "type": "string",
+                               "contents": "]",
+                               "highlight_group": ["prompt"]
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/ipython/in2.json b/config/powerline/themes/ipython/in2.json
new file mode 100644 (file)
index 0000000..601fc9e
--- /dev/null
+++ b/config/powerline/themes/ipython/in2.json
@@ -0,0 +1,13 @@
+{
+       "default_module": "powerline.segments.common",
+       "segments": {
+               "left": [
+                       {
+                               "type": "string",
+                               "contents": "",
+                               "width": "auto",
+                               "highlight_group": ["prompt"]
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/ipython/out.json b/config/powerline/themes/ipython/out.json
new file mode 100644 (file)
index 0000000..11a6323
--- /dev/null
+++ b/config/powerline/themes/ipython/out.json
@@ -0,0 +1,25 @@
+{
+       "default_module": "powerline.segments.common",
+       "segments": {
+               "left": [
+                       {
+                               "type": "string",
+                               "contents": "Out[",
+                               "draw_soft_divider": false,
+                               "width": "auto",
+                               "align": "r",
+                               "highlight_group": ["prompt"]
+                       },
+                       {
+                               "name": "prompt_count",
+                               "module": "powerline.segments.ipython",
+                               "draw_soft_divider": false
+                       },
+                       {
+                               "type": "string",
+                               "contents": "]",
+                               "highlight_group": ["prompt"]
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/ipython/rewrite.json b/config/powerline/themes/ipython/rewrite.json
new file mode 100644 (file)
index 0000000..47d8de0
--- /dev/null
+++ b/config/powerline/themes/ipython/rewrite.json
@@ -0,0 +1,23 @@
+{
+       "segments": {
+               "left": [
+                       {
+                               "type": "string",
+                               "contents": "",
+                               "draw_soft_divider": false,
+                               "width": "auto",
+                               "highlight_group": ["prompt"]
+                       },
+                       {
+                               "name": "prompt_count",
+                               "module": "powerline.segments.ipython",
+                               "draw_soft_divider": false
+                       },
+                       {
+                               "type": "string",
+                               "contents": ">",
+                               "highlight_group": ["prompt"]
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/shell/default.json b/config/powerline/themes/shell/default.json
new file mode 100644 (file)
index 0000000..6246a96
--- /dev/null
+++ b/config/powerline/themes/shell/default.json
@@ -0,0 +1,45 @@
+{
+       "default_module": "powerline.segments.common",
+       "segment_data": {
+               "hostname": {
+                       "before": " ",
+                       "args": {
+                               "only_if_ssh": true
+                       }
+               },
+               "virtualenv": {
+                       "before": "ⓔ  "
+               },
+               "branch": {
+                       "before": " "
+               }
+       },
+       "segments": {
+               "left": [
+                       {
+                               "name": "hostname"
+                       },
+                       {
+                               "name": "user"
+                       },
+                       {
+                               "name": "virtualenv"
+                       },
+                       {
+                               "name": "cwd",
+                               "args": {
+                                       "dir_limit_depth": 3
+                               }
+                       }
+               ],
+               "right": [
+                       {
+                               "module": "powerline.segments.shell",
+                               "name": "last_pipe_status"
+                       },
+                       {
+                               "name": "branch"
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/shell/default_leftonly.json b/config/powerline/themes/shell/default_leftonly.json
new file mode 100644 (file)
index 0000000..16af975
--- /dev/null
+++ b/config/powerline/themes/shell/default_leftonly.json
@@ -0,0 +1,43 @@
+{
+       "default_module": "powerline.segments.common",
+       "segment_data": {
+               "hostname": {
+                       "before": " ",
+                       "args": {
+                               "only_if_ssh": true
+                       }
+               },
+               "virtualenv": {
+                       "before": "ⓔ  "
+               },
+               "branch": {
+                       "before": " "
+               }
+       },
+       "segments": {
+               "left": [
+                       {
+                               "name": "hostname"
+                       },
+                       {
+                               "name": "user"
+                       },
+                       {
+                               "name": "virtualenv"
+                       },
+                       {
+                               "name": "branch"
+                       },
+                       {
+                               "name": "cwd",
+                               "args": {
+                                       "dir_limit_depth": 3
+                               }
+                       },
+                       {
+                               "name": "last_status",
+                               "module": "powerline.segments.shell"
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/tmux/default.json b/config/powerline/themes/tmux/default.json
new file mode 100644 (file)
index 0000000..2367821
--- /dev/null
+++ b/config/powerline/themes/tmux/default.json
@@ -0,0 +1,64 @@
+{
+       "default_module": "powerline.segments.common",
+       "segment_data": {
+               "uptime": {
+                       "before": "⇑  "
+               },
+               "external_ip": {
+                       "before": "ⓦ  "
+               },
+               "date": {
+                       "before": "⌚ "
+               },
+               "email_imap_alert": {
+                       "before": "✉ ",
+                       "args": {
+                               "username": "",
+                               "password": ""
+                       }
+               }
+       },
+       "segments": {
+               "right": [
+                       {
+                               "name": "uptime",
+                               "priority": 50
+                       },
+                       {
+                               "name": "external_ip",
+                               "priority": 50
+                       },
+                       {
+                               "name": "network_load",
+                               "priority": 50
+                       },
+                       {
+                               "name": "system_load",
+                               "priority": 50
+                       },
+                       {
+                               "name": "weather",
+                               "priority": 50
+                       },
+                       {
+                               "name": "date"
+                       },
+                       {
+                               "name": "date",
+                               "args": {
+                                       "format": "%H:%M",
+                                       "istime": true
+                               }
+                       },
+                       {
+                               "name": "email_imap_alert",
+                               "priority": 10
+                       },
+               ],
+    "left" : [
+                       {
+                               "name": "hostname"
+                       }
+    ]
+       }
+}

diff --git a/config/powerline/themes/vim/cmdwin.json b/config/powerline/themes/vim/cmdwin.json
new file mode 100644 (file)
index 0000000..c300d94
--- /dev/null
+++ b/config/powerline/themes/vim/cmdwin.json
@@ -0,0 +1,18 @@
+{
+       "segments": {
+               "left": [
+                       {
+                               "type": "string",
+                               "contents": "Command Line",
+                               "highlight_group": ["file_name"]
+                       },
+                       {
+                               "type": "string",
+                               "highlight_group": ["background"],
+                               "draw_soft_divider": false,
+                               "draw_hard_divider": false,
+                               "width": "auto"
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/vim/default.json b/config/powerline/themes/vim/default.json
new file mode 100644 (file)
index 0000000..29d6a2a
--- /dev/null
+++ b/config/powerline/themes/vim/default.json
@@ -0,0 +1,108 @@
+{
+       "segment_data": {
+               "branch": {
+                       "before": " "
+               },
+               "modified_indicator": {
+                       "args": { "text": "+" }
+               },
+               "line_percent": {
+                       "args": { "gradient": true },
+                       "after": "%"
+               },
+               "line_current_symbol": {
+                       "contents": " "
+               }
+       },
+       "segments": {
+               "left": [
+                       {
+                               "name": "mode",
+                               "exclude_modes": ["nc"]
+                       },
+                       {
+                               "name": "paste_indicator",
+                               "exclude_modes": ["nc"],
+                               "priority": 10
+                       },
+                       {
+                               "name": "branch",
+                               "exclude_modes": ["nc"],
+                               "priority": 30
+                       },
+                       {
+                               "name": "readonly_indicator",
+                               "draw_soft_divider": false,
+                               "after": " "
+                       },
+                       {
+                               "name": "file_directory",
+                               "priority": 40,
+                               "draw_soft_divider": false
+                       },
+                       {
+                               "name": "file_name",
+                               "draw_soft_divider": false
+                       },
+                       {
+                               "name": "file_vcs_status",
+                               "before": " ",
+                               "draw_soft_divider": false
+                       },
+                       {
+                               "name": "modified_indicator",
+                               "before": " "
+                       },
+                       {
+                               "type": "string",
+                               "highlight_group": ["background"],
+                               "draw_soft_divider": false,
+                               "draw_hard_divider": false,
+                               "width": "auto"
+                       }
+               ],
+               "right": [
+                       {
+                               "name": "file_format",
+                               "draw_soft_divider": false,
+                               "exclude_modes": ["nc"],
+                               "priority": 60
+                       },
+                       {
+                               "name": "file_encoding",
+                               "exclude_modes": ["nc"],
+                               "priority": 60
+                       },
+                       {
+                               "name": "file_type",
+                               "exclude_modes": ["nc"],
+                               "priority": 60
+                       },
+                       {
+                               "name": "line_percent",
+                               "priority": 50,
+                               "width": 4,
+                               "align": "r"
+                       },
+                       {
+                               "type": "string",
+                               "name": "line_current_symbol",
+                               "highlight_group": ["line_current_symbol", "line_current"]
+                       },
+                       {
+                               "name": "line_current",
+                               "draw_soft_divider": false,
+                               "width": 3,
+                               "align": "r"
+                       },
+                       {
+                               "name": "virtcol_current",
+                               "draw_soft_divider": false,
+                               "priority": 20,
+                               "before": ":",
+                               "width": 3,
+                               "align": "l"
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/vim/help.json b/config/powerline/themes/vim/help.json
new file mode 100644 (file)
index 0000000..7407105
--- /dev/null
+++ b/config/powerline/themes/vim/help.json
@@ -0,0 +1,36 @@
+{
+       "segments": {
+               "left": [
+                       {
+                               "name": "file_name",
+                               "draw_soft_divider": false
+                       },
+                       {
+                               "type": "string",
+                               "highlight_group": ["background"],
+                               "draw_soft_divider": false,
+                               "draw_hard_divider": false,
+                               "width": "auto"
+                       }
+               ],
+               "right": [
+                       {
+                               "name": "line_percent",
+                               "priority": 30,
+                               "width": 4,
+                               "align": "r"
+                       },
+                       {
+                               "type": "string",
+                               "name": "line_current_symbol",
+                               "highlight_group": ["line_current_symbol", "line_current"]
+                       },
+                       {
+                               "name": "line_current",
+                               "draw_soft_divider": false,
+                               "width": 3,
+                               "align": "r"
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/vim/quickfix.json b/config/powerline/themes/vim/quickfix.json
new file mode 100644 (file)
index 0000000..da77d63
--- /dev/null
+++ b/config/powerline/themes/vim/quickfix.json
@@ -0,0 +1,37 @@
+{
+       "segment_data": {
+               "buffer_name": {
+                       "contents": "Location List"
+               }
+       },
+       "segments": {
+               "left": [
+                       {
+                               "type": "string",
+                               "name": "buffer_name",
+                               "highlight_group": ["file_name"],
+                               "draw_soft_divider": false
+                       },
+                       {
+                               "type": "string",
+                               "highlight_group": ["background"],
+                               "draw_soft_divider": false,
+                               "draw_hard_divider": false,
+                               "width": "auto"
+                       }
+               ],
+               "right": [
+                       {
+                               "type": "string",
+                               "name": "line_current_symbol",
+                               "highlight_group": ["line_current_symbol", "line_current"]
+                       },
+                       {
+                               "name": "line_current",
+                               "draw_soft_divider": false,
+                               "width": 3,
+                               "align": "r"
+                       }
+               ]
+       }
+}

diff --git a/config/powerline/themes/wm/default.json b/config/powerline/themes/wm/default.json
new file mode 100644 (file)
index 0000000..c1cee4b
--- /dev/null
+++ b/config/powerline/themes/wm/default.json
@@ -0,0 +1,31 @@
+{
+       "default_module": "powerline.segments.common",
+       "segments": {
+               "right": [
+                       {
+                               "name": "weather",
+                               "priority": 50
+                       },
+                       {
+                               "name": "date"
+                       },
+                       {
+                               "name": "date",
+                               "args": {
+                                       "format": "%H:%M",
+                                       "istime": true
+                               },
+                               "before": "⌚ "
+                       },
+                       {
+                               "name": "email_imap_alert",
+                               "before": "✉ ",
+                               "priority": 10,
+                               "args": {
+                                       "username": "",
+                                       "password": ""
+                               }
+                       }
+               ]
+       }
+}

diff --git a/tmux-powerline b/tmux-powerline
deleted file mode 160000 (submodule)
index 9a1c6b1..0000000
--- a/tmux-powerline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9a1c6b12748fa807fbbe0c032e57fe85712a6d47

diff --git a/tmux.conf b/tmux.conf
index 02772c0c9aa8f991d97fc8273a0abdab60556e99..cd64511881a11a6dd405de5b05bb4d1cf8611cec 100644 (file)
--- a/tmux.conf
+++ b/tmux.conf
@@ -23,18 +23,7 @@ bind - split-window -v
 # set -g status-right '#[fg=black]#[bg=white]#(uptime)'
 # set -g status-right-length 70
 
 # set -g status-right '#[fg=black]#[bg=white]#(uptime)'
 # set -g status-right-length 70
 

-# powerline tmux
-set-option -g status on
-set-option -g status-bg colour12
-set-option -g status-fg colour7
-set-window-option -g window-status-current-bg colour9
-set-option -g status-interval 2
-set-option -g status-utf8 on
-set-option -g status-justify "centre"
-set-option -g status-left-length 60
-set-option -g status-right-length 90
-set-option -g status-left "#(~/.dotfiles/tmux-powerline/status-left.sh)"
-set-option -g status-right "#(~/.dotfiles/tmux-powerline/status-right.sh)"
+source /Users/benbeltran/Library/Python/2.7/lib/python/site-packages/powerline/bindings/tmux/powerline.conf

 
 #Set Activity monitoring.
 setw -g monitor-activity on
 
 #Set Activity monitoring.
 setw -g monitor-activity on

diff --git a/vim/.netrwhist b/vim/.netrwhist
index 6e853d27499ed73a843fce8c933efeab43042e7a..03884d94bcaaf800eb6e1c4931573a7344e46733 100644 (file)
--- a/vim/.netrwhist
+++ b/vim/.netrwhist
@@ -1,5 +1,6 @@
 let g:netrw_dirhistmax  =10
 let g:netrw_dirhistmax  =10

-let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_cnt =4

 let g:netrw_dirhist_1='/Users/benbeltran/.newsbeuter'
 let g:netrw_dirhist_2='/Users/benbeltran/.vim'
 let g:netrw_dirhist_3='/Users/benbeltran/.dotfiles/tmux-powerline'
 let g:netrw_dirhist_1='/Users/benbeltran/.newsbeuter'
 let g:netrw_dirhist_2='/Users/benbeltran/.vim'
 let g:netrw_dirhist_3='/Users/benbeltran/.dotfiles/tmux-powerline'

+let g:netrw_dirhist_4='/Users/benbeltran/.config'

diff --git a/vim/autoload/Powerline/Colorschemes/default.vim b/vim/autoload/Powerline/Colorschemes/default.vim
deleted file mode 100644 (file)
index 1452cf4..0000000
--- a/vim/autoload/Powerline/Colorschemes/default.vim
+++ /dev/null
@@ -1,161 +0,0 @@
-call Pl#Hi#Allocate({
-       \ 'black'          : 16,
-       \ 'white'          : 231,
-       \
-       \ 'darkestgreen'   : 22,
-       \ 'darkgreen'      : 28,
-       \ 'mediumgreen'    : 70,
-       \ 'brightgreen'    : 148,
-       \
-       \ 'darkestcyan'    : 23,
-       \ 'mediumcyan'     : 117,
-       \
-       \ 'darkestblue'    : 24,
-       \ 'darkblue'       : 31,
-       \
-       \ 'darkestred'     : 52,
-       \ 'darkred'        : 88,
-       \ 'mediumred'      : 124,
-       \ 'brightred'      : 160,
-       \ 'brightestred'   : 196,
-       \
-       \ 'darkestpurple'  : 55,
-       \ 'mediumpurple'   : 98,
-       \ 'brightpurple'   : 189,
-       \
-       \ 'brightorange'   : 208,
-       \ 'brightestorange': 214,
-       \
-       \ 'gray0'          : 233,
-       \ 'gray1'          : 235,
-       \ 'gray2'          : 236,
-       \ 'gray3'          : 239,
-       \ 'gray4'          : 240,
-       \ 'gray5'          : 241,
-       \ 'gray6'          : 244,
-       \ 'gray7'          : 245,
-       \ 'gray8'          : 247,
-       \ 'gray9'          : 250,
-       \ 'gray10'         : 252,
-       \ })
-
-let g:Powerline#Colorschemes#default#colorscheme = Pl#Colorscheme#Init([
-       \ Pl#Hi#Segments(['SPLIT'], {
-               \ 'n': ['white', 'gray2'],
-               \ 'N': ['white', 'gray0'],
-               \ 'i': ['white', 'darkestblue'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['mode_indicator'], {
-               \ 'n': ['darkestgreen', 'brightgreen', ['bold']],
-               \ 'i': ['darkestcyan', 'white', ['bold']],
-               \ 'v': ['darkred', 'brightorange', ['bold']],
-               \ 'r': ['white', 'brightred', ['bold']],
-               \ 's': ['white', 'gray5', ['bold']],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['branch', 'scrollpercent', 'raw', 'filesize'], {
-               \ 'n': ['gray9', 'gray4'],
-               \ 'N': ['gray3', 'gray1'],
-               \ 'i': ['mediumcyan', 'darkblue'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['fileinfo', 'filename'], {
-               \ 'n': ['white', 'gray4', ['bold']],
-               \ 'N': ['gray7', 'gray1', ['bold']],
-               \ 'i': ['white', 'darkblue', ['bold']],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['static_str'], {
-               \ 'n': ['white', 'gray4'],
-               \ 'N': ['gray7', 'gray1'],
-               \ 'i': ['white', 'darkblue'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['fileinfo.flags'], {
-               \ 'n': ['brightestred', ['bold']],
-               \ 'N': ['darkred'],
-               \ 'i': ['brightestred', ['bold']],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['current_function', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
-               \ 'n': ['gray8', 'gray2'],
-               \ 'i': ['mediumcyan', 'darkestblue'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['lineinfo'], {
-               \ 'n': ['gray2', 'gray10', ['bold']],
-               \ 'N': ['gray7', 'gray1', ['bold']],
-               \ 'i': ['darkestcyan', 'mediumcyan', ['bold']],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['errors'], {
-               \ 'n': ['brightestorange', 'gray2', ['bold']],
-               \ 'i': ['brightestorange', 'darkestblue', ['bold']],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['lineinfo.line.tot'], {
-               \ 'n': ['gray6'],
-               \ 'N': ['gray5'],
-               \ 'i': ['darkestcyan'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['ws_marker'], {
-               \ 'n': ['white', 'brightestred'],
-               \ 'i': ['darkestcyan', 'white'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['gundo:static_str.name', 'command_t:static_str.name'], {
-               \ 'n': ['white', 'mediumred', ['bold']],
-               \ 'N': ['brightred', 'darkestred', ['bold']],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['gundo:static_str.buffer', 'command_t:raw.line'], {
-               \ 'n': ['white', 'darkred'],
-               \ 'N': ['brightred', 'darkestred'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['gundo:SPLIT', 'command_t:SPLIT'], {
-               \ 'n': ['white', 'darkred'],
-               \ 'N': ['white', 'darkestred'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['lustyexplorer:static_str.name', 'minibufexplorer.static_str.name', 'nerdtree:raw.name', 'tagbar:static_str.name'], {
-               \ 'n': ['white', 'mediumgreen', ['bold']],
-               \ 'N': ['mediumgreen', 'darkestgreen', ['bold']],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['lustyexplorer:static_str.buffer', 'tagbar:static_str.buffer'], {
-               \ 'n': ['brightgreen', 'darkgreen'],
-               \ 'N': ['mediumgreen', 'darkestgreen'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['lustyexplorer:SPLIT', 'minibufexplorer:SPLIT', 'nerdtree:SPLIT', 'tagbar:SPLIT'], {
-               \ 'n': ['white', 'darkgreen'],
-               \ 'N': ['white', 'darkestgreen'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['ctrlp:focus', 'ctrlp:byfname'], {
-               \ 'n': ['brightpurple', 'darkestpurple'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['ctrlp:prev', 'ctrlp:next', 'ctrlp:pwd'], {
-               \ 'n': ['white', 'mediumpurple'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['ctrlp:item'], {
-               \ 'n': ['darkestpurple', 'white', ['bold']],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['ctrlp:marked'], {
-               \ 'n': ['brightestred', 'darkestpurple', ['bold']],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['ctrlp:count'], {
-               \ 'n': ['darkestpurple', 'white'],
-               \ }),
-       \
-       \ Pl#Hi#Segments(['ctrlp:SPLIT'], {
-               \ 'n': ['white', 'darkestpurple'],
-               \ }),
-       \ ])

diff --git a/vim/autoload/Powerline/Functions.vim b/vim/autoload/Powerline/Functions.vim
deleted file mode 100644 (file)
index b170ca8..0000000
--- a/vim/autoload/Powerline/Functions.vim
+++ /dev/null
@@ -1,90 +0,0 @@
-" Recalculate the trailing whitespace warning when idle, and after saving
-autocmd CursorHold,BufWritePost,InsertLeave * unlet! b:statusline_trailing_space_warning
-
-function! Powerline#Functions#GetMode() " {{{
-       let mode = mode()
-
-       if mode =~# '\v(v|V|\16)'
-               " Visual mode
-               if mode ==# 'v'
-                       let mode = 'VISUAL'
-               elseif mode ==# 'V'
-                       let mode = 'V·LINE'
-               elseif mode ==# '\16'
-                       let mode = 'V·BLOCK'
-               endif
-       elseif mode =~# '\v(s|S|\13)'
-               " Select mode
-               if mode ==# 's'
-                       let mode = 'SELECT'
-               elseif mode ==# 'S'
-                       let mode = 'S·LINE'
-               elseif mode ==# '\13'
-                       let mode = 'S·BLOCK'
-               endif
-       elseif mode =~# '\vi'
-               let mode = 'INSERT' " Insert mode
-       elseif mode =~# '\v(R|Rv)'
-               let mode = 'REPLACE' " Replace mode
-       else
-               " Fallback to normal mode
-               let mode = ' N ' " Normal (current)
-       endif
-
-       return mode
-endfunction " }}}
-function! Powerline#Functions#GetFilesize() " {{{
-       let bytes = getfsize(expand("%:p"))
-
-       if bytes <= 0
-               return ''
-       endif
-
-       if bytes < 1024
-               return bytes . 'B'
-       else
-               return (bytes / 1024) . 'kB'
-       endif
-endfunction "}}}
-function! Powerline#Functions#GetCharCode() " {{{
-       " Get the output of :ascii
-       redir => ascii
-       silent! ascii
-       redir END
-
-       if match(ascii, 'NUL') != -1
-               return 'NUL'
-       endif
-
-       " Zero pad hex values
-       let nrformat = '0x%02x'
-
-       let encoding = (&fenc == '' ? &enc : &fenc)
-
-       if encoding == 'utf-8'
-               " Zero pad with 4 zeroes in unicode files
-               let nrformat = '0x%04x'
-       endif
-
-       " Get the character and the numeric value from the return value of :ascii
-       " This matches the two first pieces of the return value, e.g.
-       " "<F>  70" => char: 'F', nr: '70'
-       let [str, char, nr; rest] = matchlist(ascii, '\v\<(.{-1,})\>\s*([0-9]+)')
-
-       " Format the numeric value
-       let nr = printf(nrformat, nr)
-
-       return "'". char ."' ". nr
-endfunction "}}}
-function! Powerline#Functions#GetWSMarker() " {{{
-       " Return '...' if trailing white space is detected
-       " Return '' otherwise
-       if ! exists("b:statusline_trailing_space_warning")
-               if search('\s$', 'nw') != 0
-                       let b:statusline_trailing_space_warning = ' … '
-               else
-                       let b:statusline_trailing_space_warning = ''
-               endif
-       endif
-       return b:statusline_trailing_space_warning
-endfunction " }}}

diff --git a/vim/autoload/Powerline/Functions/cfi.vim b/vim/autoload/Powerline/Functions/cfi.vim
deleted file mode 100644 (file)
index a7b472c..0000000
--- a/vim/autoload/Powerline/Functions/cfi.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-function! Powerline#Functions#cfi#GetCurrentFunction() " {{{
-       return cfi#format('%s', '')
-endfunction " }}}

diff --git a/vim/autoload/Powerline/Functions/ft_man.vim b/vim/autoload/Powerline/Functions/ft_man.vim
deleted file mode 100644 (file)
index 29135e4..0000000
--- a/vim/autoload/Powerline/Functions/ft_man.vim
+++ /dev/null
@@ -1,12 +0,0 @@
-function! Powerline#Functions#ft_man#GetName() " {{{
-       let matches = matchlist(getline(1), '\v^([a-zA-Z_\.\-]+)\((\d+)\)')
-
-       if ! len(matches)
-               return 'n/a'
-       endif
-
-       let file = tolower(matches[1])
-       let num = matches[2]
-
-       return file
-endfunction " }}}

diff --git a/vim/autoload/Powerline/Functions/fugitive.vim b/vim/autoload/Powerline/Functions/fugitive.vim
deleted file mode 100644 (file)
index bb00131..0000000
--- a/vim/autoload/Powerline/Functions/fugitive.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-function! Powerline#Functions#fugitive#GetBranch(symbol) " {{{
-       let ret = fugitive#statusline()
-
-       let ret = substitute(ret, '\c\v\[?GIT\(([a-z0-9\-_\./:]+)\)\]?', a:symbol .' \1', 'g')
-
-       return ret
-endfunction " }}}

diff --git a/vim/autoload/Powerline/Functions/syntastic.vim b/vim/autoload/Powerline/Functions/syntastic.vim
deleted file mode 100644 (file)
index e2c04fa..0000000
--- a/vim/autoload/Powerline/Functions/syntastic.vim
+++ /dev/null
@@ -1,16 +0,0 @@
-function! Powerline#Functions#syntastic#GetErrors(line_symbol) " {{{
-       if ! exists('g:syntastic_stl_format')
-               " Syntastic hasn't been loaded yet
-               return ''
-       endif
-
-       " Temporarily change syntastic output format
-       let old_stl_format = g:syntastic_stl_format
-       let g:syntastic_stl_format = '╱╱╱%E{ ERRORS (%e) '. a:line_symbol .' %fe }%W{ WARNINGS (%w) '. a:line_symbol .' %fw }╱╱╱'
-
-       let ret = SyntasticStatuslineFlag()
-
-       let g:syntastic_stl_format = old_stl_format
-
-       return ret
-endfunction " }}}

diff --git a/vim/autoload/Powerline/Matches.vim b/vim/autoload/Powerline/Matches.vim
deleted file mode 100644 (file)
index a71f734..0000000
--- a/vim/autoload/Powerline/Matches.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-let g:Powerline#Matches#matches = {
-       \ 'command_t'       : Pl#Match#Add('bufname("%")', 'GoToFile'),
-       \ 'ft_help'         : Pl#Match#Add('&ft'         , 'help'),
-       \ 'ft_man'          : Pl#Match#Add('&ft'         , 'man'),
-       \ 'ft_qf'           : Pl#Match#Add('&ft'         , 'qf'),
-       \ 'ft_vimpager'     : Pl#Match#Add('&ft'         , 'vimpager'),
-       \ 'gundo_preview'   : Pl#Match#Add('bufname("%")', '__Gundo_Preview__'),
-       \ 'gundo_tree'      : Pl#Match#Add('bufname("%")', '__Gundo__'),
-       \ 'lustyexplorer'   : Pl#Match#Add('bufname("%")', '\[LustyExplorer-Buffers\]'),
-       \ 'minibufexplorer' : Pl#Match#Add('bufname("%")', '\-MiniBufExplorer\-'),
-       \ 'tagbar'          : Pl#Match#Add('&ft'         , 'tagbar'),
-       \ 'nerdtree'        : Pl#Match#Add('&ft'         , 'nerdtree'),
-\ }

diff --git a/vim/autoload/Powerline/Segments.vim b/vim/autoload/Powerline/Segments.vim
deleted file mode 100644 (file)
index 837ec5f..0000000
--- a/vim/autoload/Powerline/Segments.vim
+++ /dev/null
@@ -1,28 +0,0 @@
-let g:Powerline#Segments#segments = Pl#Segment#Init(
-       \ Pl#Segment#Create('SPLIT'   , '__split__'),
-       \ Pl#Segment#Create('TRUNCATE', '__truncate__'),
-       \
-       \ Pl#Segment#Create('mode_indicator'  , '%{Powerline#Functions#GetMode()}', Pl#Segment#Modes('!N')),
-       \ Pl#Segment#Create('fileinfo',
-               \ Pl#Segment#Create('flags.ro'    , '%{&readonly ? "$RO" : ""}'),
-               \ Pl#Segment#Create('name'        , '%t'),
-               \ Pl#Segment#Create('flags.mod'   , '%M'),
-               \ Pl#Segment#Create('flags.type'  , '%H%W'),
-       \ ),
-       \ Pl#Segment#Create('filename'        , '%t'),
-       \ Pl#Segment#Create('filesize'        , '%{Powerline#Functions#GetFilesize()}', Pl#Segment#Modes('!N')),
-       \ Pl#Segment#Create('pwd'             , '%{substitute(getcwd(), expand("$HOME"), "~", "g")}'),
-       \ Pl#Segment#Create('static_str'      , '%%{"%s"}'),
-       \ Pl#Segment#Create('raw'             , '%s'),
-       \ Pl#Segment#Create('fileformat'      , '%{&fileformat}', Pl#Segment#Modes('!N')),
-       \ Pl#Segment#Create('fileencoding'    , '%{(&fenc == "" ? &enc : &fenc)}', Pl#Segment#Modes('!N')),
-       \ Pl#Segment#Create('filetype'        , '%{strlen(&ft) ? &ft : "no ft"}', Pl#Segment#Modes('!N')),
-       \ Pl#Segment#Create('scrollpercent'   , '%3p%%'),
-       \ Pl#Segment#Create('lineinfo',
-               \ Pl#Segment#Create('line.cur'    , '$LINE %3l'),
-               \ Pl#Segment#Create('line.tot'    , '$COL %-2c'),
-       \ ),
-       \ Pl#Segment#Create('charcode'        , '%{Powerline#Functions#GetCharCode()}', Pl#Segment#Modes('!N')),
-       \ Pl#Segment#Create('currhigroup'     , '%{synIDattr(synID(line("."), col("."), 1), "name")}', Pl#Segment#Modes('!N')),
-       \ Pl#Segment#Create('ws_marker'       , '%{Powerline#Functions#GetWSMarker()}', Pl#Segment#Modes('!N')),
-\ )

diff --git a/vim/autoload/Powerline/Segments/cfi.vim b/vim/autoload/Powerline/Segments/cfi.vim
deleted file mode 100644 (file)
index bde558b..0000000
--- a/vim/autoload/Powerline/Segments/cfi.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:Powerline#Segments#cfi#segments = Pl#Segment#Init('cfi',
-       \ (exists('g:cfi_disable') && g:cfi_disable == 0),
-       \
-       \ Pl#Segment#Create('current_function', '%{Powerline#Functions#cfi#GetCurrentFunction()}', Pl#Segment#Modes('!N'))
-\ )

diff --git a/vim/autoload/Powerline/Segments/ctrlp.vim b/vim/autoload/Powerline/Segments/ctrlp.vim
deleted file mode 100644 (file)
index bab5193..0000000
--- a/vim/autoload/Powerline/Segments/ctrlp.vim
+++ /dev/null
@@ -1,10 +0,0 @@
-let g:Powerline#Segments#ctrlp#segments = Pl#Segment#Init('ctrlp'
-       \ , Pl#Segment#Create('focus', '%{"%0"}')
-       \ , Pl#Segment#Create('byfname', '%{"%1"}')
-       \ , Pl#Segment#Create('prev', '%-3{"%3"}')
-       \ , Pl#Segment#Create('item', '%-9{"%4"}')
-       \ , Pl#Segment#Create('next', '%-3{"%5"}')
-       \ , Pl#Segment#Create('marked', '%{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)}')
-       \
-       \ , Pl#Segment#Create('count', '%-6{"%0"}')
-\ )

diff --git a/vim/autoload/Powerline/Segments/ft_man.vim b/vim/autoload/Powerline/Segments/ft_man.vim
deleted file mode 100644 (file)
index ee11849..0000000
--- a/vim/autoload/Powerline/Segments/ft_man.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-let g:Powerline#Segments#ft_man#segments = Pl#Segment#Init('ft_man',
-       \ Pl#Segment#Create('filename', '%{Powerline#Functions#ft_man#GetName()}')
-\ )

diff --git a/vim/autoload/Powerline/Segments/fugitive.vim b/vim/autoload/Powerline/Segments/fugitive.vim
deleted file mode 100644 (file)
index 297556b..0000000
--- a/vim/autoload/Powerline/Segments/fugitive.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:Powerline#Segments#fugitive#segments = Pl#Segment#Init('fugitive',
-       \ (exists('g:loaded_fugitive') && g:loaded_fugitive == 1),
-       \
-       \ Pl#Segment#Create('branch', '%{Powerline#Functions#fugitive#GetBranch("$BRANCH")}')
-\ )

diff --git a/vim/autoload/Powerline/Segments/rvm.vim b/vim/autoload/Powerline/Segments/rvm.vim
deleted file mode 100644 (file)
index 7e34245..0000000
--- a/vim/autoload/Powerline/Segments/rvm.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:Powerline#Segments#rvm#segments = Pl#Segment#Init('rvm',
-       \ (exists('g:loaded_rvm') && g:loaded_rvm == 1),
-       \ Pl#Segment#Create('string', '%{rvm#string()}'),
-       \ Pl#Segment#Create('statusline', '%{rvm#statusline()}')
-\ )

diff --git a/vim/autoload/Powerline/Segments/syntastic.vim b/vim/autoload/Powerline/Segments/syntastic.vim
deleted file mode 100644 (file)
index 2f0caa9..0000000
--- a/vim/autoload/Powerline/Segments/syntastic.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:Powerline#Segments#syntastic#segments = Pl#Segment#Init('syntastic',
-       \ (exists('g:loaded_syntastic_plugin') && g:loaded_syntastic_plugin == 1),
-       \
-       \ Pl#Segment#Create('errors', '%{Powerline#Functions#syntastic#GetErrors("$LINE")}', Pl#Segment#Modes('!N'))
-\ )

diff --git a/vim/autoload/Powerline/Segments/virtualenv.vim b/vim/autoload/Powerline/Segments/virtualenv.vim
deleted file mode 100644 (file)
index 90661f1..0000000
--- a/vim/autoload/Powerline/Segments/virtualenv.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-let g:Powerline#Segments#virtualenv#segments = Pl#Segment#Init('virtualenv',
-       \ has('python') && (exists('g:virtualenv_loaded') && g:virtualenv_loaded == 1),
-       \
-       \ Pl#Segment#Create('statusline', '%{VirtualEnvStatusline()}')
-\ )

diff --git a/vim/autoload/Powerline/Themes/default.vim b/vim/autoload/Powerline/Themes/default.vim
deleted file mode 100644 (file)
index 75106eb..0000000
--- a/vim/autoload/Powerline/Themes/default.vim
+++ /dev/null
@@ -1,114 +0,0 @@
-let g:Powerline#Themes#default#theme = Pl#Theme#Create(
-       \ Pl#Theme#Buffer(''
-               \ , 'mode_indicator'
-               \ , 'fugitive:branch'
-               \ , 'fileinfo'
-               \ , 'syntastic:errors'
-               \ , Pl#Segment#Truncate()
-               \ , 'cfi:current_function'
-               \ , Pl#Segment#Split()
-               \ , 'rvm:string'
-               \ , 'virtualenv:statusline'
-               \ , 'fileformat'
-               \ , 'fileencoding'
-               \ , 'filetype'
-               \ , 'scrollpercent'
-               \ , 'lineinfo'
-       \ ),
-       \
-       \ Pl#Theme#Buffer('command_t'
-               \ , ['static_str.name', 'Command-T']
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-               \ , ['raw.line', '%10(Match #%l%)']
-       \ ),
-       \
-       \ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_tree')
-               \ , ['static_str.name', 'Gundo']
-               \ , ['static_str.buffer', 'Undo tree']
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-       \ ),
-       \
-       \ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_preview')
-               \ , ['static_str.name', 'Gundo']
-               \ , ['static_str.buffer', 'Diff preview']
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-       \ ),
-       \
-       \ Pl#Theme#Buffer('ft_help'
-               \ , ['static_str.name', 'Help']
-               \ , 'filename'
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-               \ , 'scrollpercent'
-       \ ),
-       \
-       \ Pl#Theme#Buffer('ft_vimpager'
-               \ , ['static_str.name', 'Pager']
-               \ , 'filename'
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-               \ , 'scrollpercent'
-       \ ),
-       \
-       \ Pl#Theme#Buffer('lustyexplorer'
-               \ , ['static_str.name', 'LustyExplorer']
-               \ , ['static_str.buffer', 'Buffer list']
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-       \ ),
-       \
-       \ Pl#Theme#Buffer('ft_man'
-               \ , ['static_str.name', 'Man page']
-               \ , 'filename'
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-               \ , 'scrollpercent'
-       \ ),
-       \
-       \ Pl#Theme#Buffer('minibufexplorer'
-               \ , ['static_str.name', 'MiniBufExplorer']
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-       \ ),
-       \
-       \ Pl#Theme#Buffer('ft_qf'
-               \ , ['static_str.name', 'Quickfix']
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-       \ ),
-       \
-       \ Pl#Theme#Buffer('tagbar'
-               \ , ['static_str.name', 'Tagbar']
-               \ , ['static_str.buffer', 'Tree']
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-       \ ),
-       \
-       \ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_main', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "%s"')
-               \ , 'ctrlp:prev'
-               \ , 'ctrlp:item'
-               \ , 'ctrlp:next'
-               \ , 'ctrlp:marked'
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-               \ , 'ctrlp:focus'
-               \ , 'ctrlp:byfname'
-               \ , 'pwd'
-       \ ),
-       \
-       \ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_prog', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "%s"')
-               \ , 'ctrlp:count'
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-               \ , 'pwd'
-       \ ),
-       \
-       \ Pl#Theme#Buffer('nerdtree'
-               \ , ['raw.name', '%{expand("%:p:h")}']
-               \ , Pl#Segment#Truncate()
-               \ , Pl#Segment#Split()
-       \ )
-\ )

diff --git a/vim/doc/Powerline.txt b/vim/doc/Powerline.txt
deleted file mode 100644 (file)
index 7ec7a50..0000000
--- a/vim/doc/Powerline.txt
+++ /dev/null
@@ -1,322 +0,0 @@
-*Powerline.txt*        For Vim version 7.3.    Last change: 2011 Nov 23
-
-                                            ______
-         _________                          \    /__
-         \_____   \______  _  _____________ /   /'__' ___   ____
-          |    ___/  _ \ \/ \/ / __ \_  ___\   / |  |/   \_/ __ \
-          |   |  |  (_) \  _  /  ___/|  |  /  /__|  |  |  \  ___/
-          '___'   \____/ \/ \/ \___  |__' /___  /'__'__|  /\___ \
-                                   \/        / /        \/     \/
-                                            | /
-                                            |/
-                                            '
-
-==============================================================================
-CONTENTS                                                  *Powerline-contents*
-
-    1. Introduction ....................... |Powerline-introduction|
-    2. Usage .............................. |Powerline-usage|
-    3. Requirements ....................... |Powerline-requirements|
-       3.1 Recommended settings ........... |Powerline-recommended-settings|
-    4. Configuration ...................... |Powerline-configuration|
-       4.1 Powerline_cache_file ........... |Powerline_cache_file|
-           4.1.1 Clearing the cache ....... |:PowerlineClearCache|
-       4.2 Powerline_cache_enabled ........ |Powerline_cache_enabled|
-       4.3 Powerline_symbols .............. |Powerline_symbols|
-           4.3.1 Compatible symbols ....... |Powerline-symbols-compatible|
-           4.3.2 Fancy symbols ............ |Powerline-symbols-fancy|
-       4.4 Powerline_theme ................ |Powerline_theme|
-       4.5 Powerline_colorscheme .......... |Powerline_colorscheme|
-    5. Fonts .............................. |Powerline-fonts|
-    6. Customization ...................... |Powerline-customization|
-       6.1 Basic customization ............ |Powerline-basic-customization|
-       6.2 Advanced customization ......... |Powerline-advanced-customization|
-           6.2.1 Colorschemes ............. |Powerline-cust-colorschemes|
-           6.2.2 Functions ................ |Powerline-cust-functions|
-           6.2.3 Segments ................. |Powerline-cust-segments|
-           6.2.4 Themes ................... |Powerline-cust-themes|
-    7. License ............................ |Powerline-license|
-    8. Known issues ....................... |Powerline-known-issues|
-    9. Contributing ....................... |Powerline-contributing|
-
-==============================================================================
-1. Introduction                           *Powerline* *Powerline-introduction*
-
-Powerline is a utility plugin which allows you to create better-looking, more 
-functional vim statuslines.
-
-==============================================================================
-2. Usage                                                     *Powerline-usage*
-
-Powerline is automatically enabled when it's installed, either by unzipping 
-the provided archive or by adding it as a Pathogen/Vundle bundle.
-
-==============================================================================
-3. Requirements                                       *Powerline-requirements*
-
-Powerline has been developed and tested in vim 7.3, but it should run without 
-any problems in vim 7.2. The default configuration requires a Unix-like system 
-to work properly.
-
-The plugin only works with vim running in an 88/256-color terminal or gvim.
-
-Vi-compatible mode must be disabled.
-
-------------------------------------------------------------------------------
-3.1 Recommended settings                      *Powerline-recommended-settings*
-
-The following configuration options should be set in your |vimrc|: >
-
-    set nocompatible   " Disable vi-compatibility
-    set laststatus=2   " Always show the statusline
-    set encoding=utf-8 " Necessary to show unicode glyphs
-
-Note: If you're using an 88/256-color terminal but still don't see the colored 
-statusline, you may have to set the following option as well: >
-
-    set t_Co=256 " Explicitly tell vim that the terminal supports 256 colors
-
-==============================================================================
-4. Configuration                                     *Powerline-configuration*
-
-Powerline will work fine without any user configuration, but default behavior 
-can be overridden by setting configuration variables globally in your |vimrc| 
-file.
-
-------------------------------------------------------------------------------
-4.1 Powerline_cache_file                                *Powerline_cache_file*
-
-By default Powerline caches all the statuslines and colors in a cache file in 
-the plugin's directory (or the vim directory, depending on the installation 
-method used).
-
-It's recommended that you enable the cache, as this dramatically improves vim 
-startup time after the cache file has been generated (the plugin usually loads 
-within ~100ms without the cache and ~1ms with the cache).
-
-Note: The default cache filename includes the current theme, colorscheme and 
-symbol settings in order to tie the cache file your current configuration, so 
-the cache file will be regenerated when you change any settings. This may 
-leave several old cache files in your vim folder, and these may safely be 
-deleted.
-
-Defaults: "<plugin_directory>/Powerline_<theme>_<colorscheme>_<symbols>.cache"
-
-------------------------------------------------------------------------------
-4.1.1 Clearing the cache                                *:PowerlineClearCache*
-
-Powerline provides a command to easily clear the cache after changing your 
-settings or updating your theme. Simply run the following command to clear 
-your cache, and restart vim afterwards: >
-
-    :PowerlineClearCache
-<
-------------------------------------------------------------------------------
-4.2 Powerline_cache_enabled                          *Powerline_cache_enabled*
-
-It's possible to disable statusline caching by setting this option to 0. This 
-is mostly useful when developing statuslines.
-
-Default: 1
-
-------------------------------------------------------------------------------
-4.3 Powerline_symbols                                      *Powerline_symbols*
-
-This option defines which set of symbols and dividers you want to use. There 
-are currently three available options: "compatible", "unicode" and "fancy".
-
-    TYPE           DESCRIPTION ~
-    compatible     Doesn't use any special characters.
-    unicode        Simulates icons and arrows using similar unicode glyphs.
-    fancy          Custom icons and arrows. Requires a patched font.
-
-Symbols can be inserted into statuslines by using the following variables 
-(just insert the variables as text in your segments):
-
-    VARIABLE       DESCRIPTION ~
-    $BRANCH        Inserts a branch symbol
-    $RO            Inserts a read-only symbol
-    $FT            Inserts a filetype symbol
-    $LINE          Inserts a line number symbol
-
-Default: "compatible"
-
-------------------------------------------------------------------------------
-4.3.1 Compatible symbols                        *Powerline-symbols-compatible*
-
-These symbols will work in any configuration, and do not require a special 
-font to work. This option will replace the fancy icons with plain text, and 
-the pointy dividers with straight lines.
-
-------------------------------------------------------------------------------
-4.3.2 Fancy symbols                                  *Powerline-symbols-fancy*
-
-These symbols require a custom font to work. A font patcher is provided for 
-adding the required symbols to any outline font and some bitmap fonts, see 
-|Powerline-fonts| and the provided README file for usage details.
-
-------------------------------------------------------------------------------
-4.4 Powerline_theme                                          *Powerline_theme*
-
-This option defines the theme Powerline uses. The available themes are located 
-in autoload/Powerline/Themes/.
-
-Default: "default"
-
-------------------------------------------------------------------------------
-4.5 Powerline_colorscheme                              *Powerline_colorscheme*
-
-This option defines the colorscheme Powerline uses. The available colorschemes 
-are located in autoload/Powerline/Colorschemes/.
-
-Default: "default"
-
-==============================================================================
-5. Fonts                                                     *Powerline-fonts*
-
-TODO
-
-==============================================================================
-6. Customization                                     *Powerline-customization*
-
-There are currently two ways of customizing Powerline: Basic customization 
-using a couple of functions to insert and remove existing segments from the 
-statusline, and advanced customization using your own autoload files. The 
-customization features of Powerline allow you to create your own statuslines 
-without ever touching the original source code.
-
-------------------------------------------------------------------------------
-6.1 Basic customization                        *Powerline-basic-customization*
-
-Powerline provides the following functions to alter the default statusline 
-look. These functions should be called from your |vimrc| file or another file 
-which is sourced at vim startup.
-
-Note: These functions are currently applied to all statuslines, so if you 
-insert a segment after a segment which is present in many statuslines (e.g.  
-the "filename" segment), all the statuslines will have the inserted segment.  
-This behavior may be changed in a future version of Powerline.
-
-Note: Remember to clear your cache with |:PowerlineClearCache| after changing 
-your statusline!
-
-Example: >
-
-    " Insert the charcode segment after the filetype segment
-    call Pl#Theme#InsertSegment('charcode', 'after', 'filetype')
-
-    " Replace the scrollpercent segment with the charcode segment
-    call Pl#Theme#ReplaceSegment('scrollpercent', 'fileinfo')
-<
-                                                      *Pl#Theme#InsertSegment*
-Pl#Theme#InsertSegment({newsegment}, {location}, {targetsegment})
-
-This function inserts {newsegment} before or after {targetsegment}. The 
-{location} parameter specifies the location of the new segment, valid values 
-are "before" and "after". You can see all the available segments in 
-autoload/Powerline/Segments.vim and the files specified in 
-|Powerline-cust-segments|.
-
-Pl#Theme#RemoveSegment({targetsegment})               *Pl#Theme#RemoveSegment*
-
-This function removes the {targetsegment} segment entirely.
-
-Pl#Theme#ReplaceSegment({oldsegment}, {newsegment})  *Pl#Theme#ReplaceSegment*
-
-This function replaces {oldsegment} with {newsegment}.
-
-------------------------------------------------------------------------------
-6.2 Advanced customization                  *Powerline-advanced-customization*
-
-Because Powerline utilizes vim's autoload functionality, you can easily create 
-your own segments, themes, functions and colorschemes without touching the 
-original source code. This is a bit more complex than using the utility 
-functions, but it allows you to do a lot more with your statusline.
-
-Your custom autoload files should be stored in your |runtimepath| (usually in 
-"~/.vim/autoload/Powerline/*").
-
-Note: Remember to clear your cache with |:PowerlineClearCache| after changing 
-your statusline!
-
-6.2.1 Colorschemes                               *Powerline-cust-colorschemes*
-------------------------------------------------------------------------------
-
-Colorschemes should be stored as separate files in 
-{runtimepath}/autoload/Powerline/Colorschemes/.
-
-SYNTAX ~
-
-TODO
-
-EXAMPLE ~
-
-TODO
-
-6.2.2 Functions                                     *Powerline-cust-functions*
-------------------------------------------------------------------------------
-
-Functions should be stored as separate files in 
-{runtimepath}/autoload/Powerline/Functions/.
-
-SYNTAX ~
-
-TODO
-
-EXAMPLE ~
-
-TODO
-
-6.2.3 Segments                                       *Powerline-cust-segments*
-------------------------------------------------------------------------------
-
-Segments should be stored as separate files in 
-{runtimepath}/autoload/Powerline/Segments/.
-
-SYNTAX ~
-
-TODO
-
-EXAMPLE ~
-
-TODO
-
-6.2.4 Themes                                           *Powerline-cust-themes*
-------------------------------------------------------------------------------
-
-Themes should be stored as separate files in 
-{runtimepath}/autoload/Powerline/Themes/.
-
-SYNTAX ~
-
-TODO
-
-EXAMPLE ~
-
-TODO
-
-==============================================================================
-7. License                                                 *Powerline-license*
-
-Creative Commons Attribution-ShareAlike 3.0 Unported
-
-http://creativecommons.org/licenses/by-sa/3.0/
-
-==============================================================================
-8. Known issues                                       *Powerline-known-issues*
-
-See the issue tracker at
-https://github.com/Lokaltog/vim-powerline/issues
-
-==============================================================================
-9. Contributing                                       *Powerline-contributing*
-
-If you experience any bugs or have feature requests, please open an issue on
-GitHub. Fork the source repository on GitHub and send a pull request if you
-have any code improvements.
-
-Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
-Source repository: https://github.com/Lokaltog/vim-powerline
-
-==============================================================================
-vim:tw=78:sw=4:ts=8:ft=help:norl:

diff --git a/vim/plugin/Powerline.vim b/vim/plugin/Powerline.vim
deleted file mode 100644 (file)
index 12b4204..0000000
--- a/vim/plugin/Powerline.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-" Powerline - The ultimate statusline utility
-"
-" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
-" Source repository: https://github.com/Lokaltog/vim-powerline
-
-" Script initialization {{{
-       if exists('g:Powerline_loaded') || &compatible || version < 702
-               finish
-       endif
-
-       let g:Powerline_loaded = 1
-" }}}
-" Commands {{{
-       command! PowerlineClearCache call Pl#ClearCache()
-       command! PowerlineReloadColorscheme call Pl#ReloadColorscheme()
-" }}}
-" Set default options {{{
-       for [s:key, s:value] in items({
-               \   'theme'        : 'default'
-               \ , 'colorscheme'  : 'default'
-               \ , 'symbols'      : 'compatible'
-               \ , 'cache_enabled': 1
-               \ })
-
-               if ! exists('g:Powerline_' . s:key)
-                       exec printf('let g:Powerline_%s = %s', s:key, string(s:value))
-               endif
-       endfor
-
-       if ! exists('g:Powerline_cache_file')
-               exec 'let g:Powerline_cache_file = '. string(printf('%s/Powerline_%s_%s_%s.cache'
-                       \ , simplify(expand('<sfile>:p:h') .'/..')
-                       \ , g:Powerline_theme
-                       \ , g:Powerline_colorscheme
-                       \ , g:Powerline_symbols
-                       \ ))
-       endif
-" }}}
-" Autocommands {{{
-       augroup Powerline
-               autocmd!
-
-               " Reload statuslines when changing color scheme
-               au ColorScheme *
-                       \ call Pl#Load()
-
-               au BufEnter,WinEnter,FileType,BufUnload *
-                       \ call Pl#UpdateStatusline(1)
-
-               au BufLeave,WinLeave *
-                       \ call Pl#UpdateStatusline(0)
-
-               au BufWritePost */autoload/Powerline/Colorschemes/*.vim
-                       \ :PowerlineReloadColorscheme
-       augroup END
-" }}}

diff --git a/vimrc b/vimrc
index eea2e288fd47949f43eb1b82118d1c8f639aaf4a..bf769250d4d985c6400a0b508006f5bfe6c45465 100755 (executable)
--- a/vimrc
+++ b/vimrc
@@ -161,7 +161,7 @@ set nofoldenable
 set foldlevel=1
 
 " powerline stuff
 set foldlevel=1
 
 " powerline stuff

-let g:Powerline_symbols = 'fancy'
+set rtp+=/Users/benbeltran/Library/Python/2.7/lib/python/site-packages/powerline/bindings/vim

 
 " Fix CtrlP root folder and add some ignores
 let g:ctrlp_working_path_mode = 0
 
 " Fix CtrlP root folder and add some ignores
 let g:ctrlp_working_path_mode = 0