From 2a50e55c438f2dacfa7e75855bcbf5d79eeda047 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Thu, 21 Mar 2013 00:28:55 -0500 Subject: [PATCH] Switching from the old separate powerlines to the new python powerline --- my_tmux_theme.sh | 58 ---------------------- powerline-shell | 1 - tmux-powerline | 1 - tmux-powerlinerc | 127 ----------------------------------------------- tmux.conf | 11 +--- vimrc | 4 +- zshrc | 17 +------ 7 files changed, 7 insertions(+), 212 deletions(-) delete mode 100644 my_tmux_theme.sh delete mode 160000 powerline-shell delete mode 160000 tmux-powerline delete mode 100644 tmux-powerlinerc diff --git a/my_tmux_theme.sh b/my_tmux_theme.sh deleted file mode 100644 index cf366b5..0000000 --- a/my_tmux_theme.sh +++ /dev/null @@ -1,58 +0,0 @@ -# Default Theme - -if patched_font_in_use; then - TMUX_POWERLINE_SEPARATOR_LEFT_BOLD="⮂" - TMUX_POWERLINE_SEPARATOR_LEFT_THIN="⮃" - TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD="⮀" - TMUX_POWERLINE_SEPARATOR_RIGHT_THIN="⮁" -else - TMUX_POWERLINE_SEPARATOR_LEFT_BOLD="◀" - TMUX_POWERLINE_SEPARATOR_LEFT_THIN="❮" - TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD="▶" - TMUX_POWERLINE_SEPARATOR_RIGHT_THIN="❯" -fi - -TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR=${TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR:-'235'} -TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR=${TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR:-'255'} - -TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR=${TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR:-$TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD} -TMUX_POWERLINE_DEFAULT_RIGHTSIDE_SEPARATOR=${TMUX_POWERLINE_DEFAULT_RIGHTSIDE_SEPARATOR:-$TMUX_POWERLINE_SEPARATOR_LEFT_BOLD} - - -# Format: segment_name background_color foreground_color [non_default_separator] - -if [ -z $TMUX_POWERLINE_LEFT_STATUS_SEGMENTS ]; then - TMUX_POWERLINE_LEFT_STATUS_SEGMENTS=( - "tmux_session_info 148 234" \ - "hostname 33 0" \ - #"ifstat 30 255" \ - #"ifstat_sys 30 255" \ - "lan_ip 24 255 ${TMUX_POWERLINE_SEPARATOR_RIGHT_THIN}" \ - "wan_ip 24 255" \ - "vcs_branch 29 88" \ - "vcs_compare 60 255" \ - "vcs_staged 64 255" \ - "vcs_modified 9 255" \ - "vcs_others 245 0" \ - ) -fi - -if [ -z $TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS ]; then - TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS=( - #"earthquake 3 0" \ - "pwd 89 211" \ - #"mailcount 9 255" \ - "now_playing 234 37" \ - #"cpu 240 136" \ - "load 237 167" \ - #"tmux_mem_cpu_load 234 136" \ - "battery 137 127" \ - #"weather 37 255" \ - #"rainbarf 0 0" \ - #"xkb_layout 125 117" \ - "date_day 235 136" \ - "date 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" \ - "time 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" \ - #"utc_time 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" \ - ) -fi diff --git a/powerline-shell b/powerline-shell deleted file mode 160000 index 5db13df..0000000 --- a/powerline-shell +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5db13df59db7074da94b99b56379068e2e81463b diff --git a/tmux-powerline b/tmux-powerline deleted file mode 160000 index 111be96..0000000 --- a/tmux-powerline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 111be96d3da09b47a05c54a7a4ec174f94b35d61 diff --git a/tmux-powerlinerc b/tmux-powerlinerc deleted file mode 100644 index 998130a..0000000 --- a/tmux-powerlinerc +++ /dev/null @@ -1,127 +0,0 @@ -# Default configuration file for tmux-powerline. -# Modeline { -# vi: foldmarker={,} foldmethod=marker foldlevel=0 tabstop=4 filetype=sh -# } - -# General { - # Show which segment fails and its exit code. - export TMUX_POWERLINE_DEBUG_MODE_ENABLED="true" - # Use patched font symbols. - export TMUX_POWERLINE_PATCHED_FONT_IN_USE="true" - # The theme to use. - export TMUX_POWERLINE_THEME="my_tmux_theme" - # Overlay dirctory to look for themes. There you can put your own themes outside the repo. Fallback will still be the "themes" directory in the repo. - export TMUX_POWERLINE_DIR_USER_THEMES="~/dotfiles/" - # Overlay dirctory to look for segments. There you can put your own segments outside the repo. Fallback will still be the "segments" directory in the repo. - export TMUX_POWERLINE_DIR_USER_SEGMENTS="" -# } - -# battery.sh { - # How to display battery remaining. Can be {percentage, cute}. - export TMUX_POWERLINE_SEG_BATTERY_TYPE="percentage" - # How may hearts to show if cute indicators are used. - export TMUX_POWERLINE_SEG_BATTERY_NUM_HEARTS="5" -# } - -# date.sh { - # date(1) format for the date. If you don't, for some reason like ISO 8601 format, you might want to have "%D" or "%m/%d/%Y". - export TMUX_POWERLINE_SEG_DATE_FORMAT="%F" -# } - -# earthquake.sh { - # The data provider to use. Currently only "goo" is supported. - export TMUX_POWERLINE_SEG_EARTHQUAKE_DATA_PROVIDER="goo" - # How often to update the earthquake data in seconds. - # Note: This is not an early warning detector, use this - # to be informed about recent earthquake magnitudes in your - # area. If this is too often, goo may decide to ban you form - # their server - export TMUX_POWERLINE_SEG_EARTHQUAKE_UPDATE_PERIOD="600" - # Only display information when earthquakes are within this many minutes - export TMUX_POWERLINE_SEG_EARTHQUAKE_ALERT_TIME_WINDOW="60" - # Display time with this format - export TMUX_POWERLINE_SEG_EARTHQUAKE_TIME_FORMAT='(%H:%M)' - # Display only if magnitude is greater or equal to this number - export TMUX_POWERLINE_SEG_EARTHQUAKE_MIN_MAGNITUDE="3" -# } - -# hostname.sh { - # Use short or long format for the hostname. Can be {"short, long"}. - export TMUX_POWERLINE_SEG_HOSTNAME_FORMAT="short" -# } - -# mailcount.sh { - # Mailbox type to use. Can be any of {apple_mail, gmail, maildir, mbox} - export TMUX_POWERLINE_SEG_MAILCOUNT_MAILBOX_TYPE="" - - ## Gmail - # Enter your Gmail username here WITH OUT @gmail.com.( OR @domain) - export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_USERNAME="" - # Google password. Recomenned to use application specific password (https://accounts.google.com/b/0/IssuedAuthSubTokens) Leave this empty to get password from OS X keychain. - # For OSX users : MAKE SURE that you add a key to the keychain in the format as follows - # Keychain Item name : http:// - # Account name : @ - # Password : Your password ( Once again, try to use 2 step-verification and application-specific password) - # See http://support.google.com/accounts/bin/answer.py?hl=en&answer=185833 for more info. - export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_PASSWORD="" - # Domain name that will complete your email. For normal GMail users it probably is "gmail.com but can be "foo.tld" for Google Apps users. - export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_SERVER="gmail.com" - # How often in minutes to check for new mails. - export TMUX_POWERLINE_SEG_MAILCOUNT_GMAIL_INTERVAL="5" - - ## Maildir - # Path to the maildir to check. - export TMUX_POWERLINE_SEG_MAILCOUNT_MAILDIR_INBOX="/Users/iocom/.mail/inbox/new" - - ## mbox - # Path to the mbox to check. - export TMUX_POWERLINE_SEG_MAILCOUNT_MBOX_INBOX="" -# } - -# now_playing.sh { - # Music player to use. Can be any of {audacious, banshee, cmus, itunes, lastfm, mocp, mpd, mpd_simple, pithos, rdio, rhythmbox, spotify, spotify_wine}. - export TMUX_POWERLINE_SEG_NOW_PLAYING_MUSIC_PLAYER="rdio" - # Maximum output length. - export TMUX_POWERLINE_SEG_NOW_PLAYING_MAX_LEN="40" - # How to handle too long strings. Can be {trim, roll}. - export TMUX_POWERLINE_SEG_NOW_PLAYING_TRIM_METHOD="trim" - # Charcters per second to roll if rolling trim method is used. - export TMUX_POWERLINE_SEG_NOW_PLAYING_ROLL_SPEED="2" - - # Hostname for MPD server in the format "[password@]host" - export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_HOST="localhost" - # Port the MPD server is running on. - export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_PORT="6600" - # Song display format for mpd_simple. See mpc(1) for delimiters. - export TMUX_POWERLINE_SEG_NOW_PLAYING_MPD_SIMPLE_FORMAT="%artist% - %title%" - - # Username for Last.fm if that music player is used. - export TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_USERNAME="" - # How often in seconds to update the data from last.fm. - export TMUX_POWERLINE_SEG_NOW_PLAYING_LASTFM_UPDATE_PERIOD="30" -# } - -# pwd.sh { - # Maximum length of output. - export TMUX_POWERLINE_SEG_PWD_MAX_LEN="40" -# } - -# time.sh { - # date(1) format for the time. Americans might want to have "%I:%M %p". - export TMUX_POWERLINE_SEG_TIME_FORMAT="%H:%M" -# } - -# weather.sh { - # The data provider to use. Currently only "yahoo" is supported. - export TMUX_POWERLINE_SEG_WEATHER_DATA_PROVIDER="yahoo" - # What unit to use. Can be any of {c,f,k}. - export TMUX_POWERLINE_SEG_WEATHER_UNIT="c" - # How often to update the weather in seconds. - export TMUX_POWERLINE_SEG_WEATHER_UPDATE_PERIOD="600" - - # Your location. Find a code that works for you: - # 1. Go to Yahoo weather http://weather.yahoo.com/ - # 2. Find the weather for you location - # 3. Copy the last numbers in that URL. e.g. "http://weather.yahoo.com/united-states/california/newport-beach-12796587/" has the numbers "12796587" - export TMUX_POWERLINE_SEG_WEATHER_LOCATION="" -# } diff --git a/tmux.conf b/tmux.conf index d4761c4..79efcfc 100644 --- a/tmux.conf +++ b/tmux.conf @@ -23,12 +23,5 @@ set-option -g status-keys vi set -g default-terminal "screen-256color" -set-option -g status on -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/powerline.sh left)" -set-option -g status-right "#(~/dotfiles/tmux-powerline/powerline.sh right)" -set-window-option -g window-status-current-format "#[fg=colour235, bg=colour27]⮀#[fg=colour255, bg=colour27] #I ⮁ #W #[fg=colour27, bg=colour235]⮀" +# Powerline +source '/usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf' diff --git a/vimrc b/vimrc index 92da228..39de35c 100644 --- a/vimrc +++ b/vimrc @@ -19,7 +19,6 @@ Bundle 'tpope/vim-fugitive' Bundle 'tpope/vim-endwise' " Bundle 'tpope/vim-unimpared' Bundle 'mileszs/ack.vim' -Bundle 'Lokaltog/vim-powerline.git' Bundle 'Lokaltog/vim-easymotion' Bundle 'bkad/CamelCaseMotion' Bundle 'majutsushi/tagbar' @@ -52,6 +51,9 @@ let $GIT_SSL_NO_VERIFY = 'true' filetype plugin indent on " last Vundle requirement +" Powerline weirdness +set rtp+=/usr/local/lib/python2.7/site-packages/powerline/bindings/vim + " mouse if has("mouse") set mouse=a diff --git a/zshrc b/zshrc index e95b605..3e51bb4 100644 --- a/zshrc +++ b/zshrc @@ -1,21 +1,8 @@ # Start tmux... just trying it out # if [ "$TMUX" = "" ]; then tmux; fi -# powerline-shell -function powerline_precmd() { - export PS1="$(~/dotfiles/powerline-shell/powerline-shell.py $? --shell zsh)" -} - -function install_powerline_precmd() { - for s in "${precmd_functions[@]}"; do - if [ "$s" = "powerline_precmd" ]; then - return - fi - done - precmd_functions+=(powerline_precmd) -} - -install_powerline_precmd +# Powerline +. /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh # Tmuxinator [[ -s $HOME/.tmuxinator/scripts/tmuxinator ]] && source $HOME/.tmuxinator/scripts/tmuxinator