dotfiles

Unnamed repository; edit this file 'description' to name the repository.
git clone git://edryd.org/dotfiles
Log | Files | Refs

commit 75eec71bee8fd10a2140d1d6e3940748ae32a8cf
parent 279cf7c9f43b78a68ee94a30beb469ff3cc44d5d
Author: edvb54 <edvb54@gmail.com>
Date:   Sat, 21 Jun 2014 18:12:12 -0700

Update TMUX status line to match Vim's status line.

Diffstat:
tmux.conf | 121+++++++++++++++++++++++++++++++++++++++++--------------------------------------
vimrc | 21+++++++++++----------
2 files changed, 74 insertions(+), 68 deletions(-)

diff --git a/tmux.conf b/tmux.conf @@ -52,74 +52,79 @@ set -g prefix C-Space unbind C-b #}}} -# status old{{{1 -# set -g status-bg black +# classic status{{{1 +set -g status-bg colour236 -# set -g window-status-current-fg white -# set -g window-status-current-bg blue -# set -g window-status-current-attr bright +set -g window-status-current-fg white +set -g window-status-current-bg blue +set -g window-status-current-attr bright -# set -g window-status-last-fg white -# set -g window-status-last-bg default -# set -g window-status-last-attr bright +set -g window-status-last-fg white +set -g window-status-last-bg default +set -g window-status-last-attr bright -# set -g window-status-fg white -# set -g window-status-bg default -# set -g window-status-attr dim +set -g window-status-fg white +set -g window-status-bg default +set -g window-status-attr dim -# set -g message-fg white -# set -g message-bg blue -# set -g message-attr bright +set -g message-fg white +set -g message-bg blue +set -g message-attr bright -# set -g status-interval 1 -# set -g status-justify centre -# set -g status-left-length 158 -# set -g status-right-length 140 - -# set -g status-left '\ -# #[fg=white][#[fg=blue]#S#[fg=white]]\ -# #[fg=white][#[fg=cyan]#{pane_current_path}#[fg=white]]\ -# ' -# set -g status-right '\ -# #[fg=white][#[fg=cyan]#H#[fg=white]]\ -# #[fg=white][#[fg=blue]%a%l:%M#[fg=white]]\ -# ' +set -g status-interval 1 +set -g status-justify centre +set -g status-left-length 158 +set -g status-right-length 140 + +set -g status-left '\ +#[fg=blue]#{pane_current_path} \ +#[fg=green]%m-%d \ +#[fg=cyan]#S \ +' +set -g status-right '\ +#[fg=cyan]##P \ +#[fg=green]%l:%M \ +#[fg=blue]#H\ +' + +setw -g window-status-format "#I #W " +setw -g window-status-current-format "#I #W " #}}} -# status new{{{ +# powerline status{{{ # This tmux statusbar config was created by tmuxline.vim -set -g status-justify centre -set -g status on -set -g status-bg black -set -g status-utf8 on -set -g status-right-length 100 -set -g status-left-length 100 -setw -g window-status-activity-attr none -setw -g window-status-separator "" -set -g message-fg white -set -g message-bg blue +# set -g status-justify centre +# set -g status on +# set -g status-bg black +# set -g status-utf8 on +# set -g status-right-length 100 +# set -g status-left-length 100 +# setw -g window-status-activity-attr none +# setw -g window-status-separator "" +# set -g message-fg white +# set -g message-bg blue -set -g status-left "\ -#[fg=colour15,bg=colour14,bold] #S #[fg=colour14,bg=colour11,nobold,nounderscore,noitalics]\ -#[fg=colour7,bg=colour11] #{pane_current_path} #[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]\ -" - -set -g status-right "\ -#[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] %l:%M \ - %a %d #[fg=colour14,bg=colour11,nobold,nounderscore,noitalics]\ -#[fg=colour15,bg=colour14] #h \ -" - -setw -g window-status-format "\ -#[fg=colour10,bg=colour0] #I \ -#[fg=colour10,bg=colour0] #W \ -" - -setw -g window-status-current-format "\ -#[fg=colour0,bg=colour11,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] #I \ -#[fg=colour7,bg=colour11] #W #[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]\ -" +# set -g status-left "\ +# #[fg=colour15,bg=colour14,bold] #S #[fg=colour14,bg=colour11,nobold,nounderscore,noitalics]\ +# #[fg=colour7,bg=colour11] #{pane_current_path} #[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]\ +# " + +# set -g status-right "\ +# #[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] %l:%M \ +#  %a %d #[fg=colour14,bg=colour11,nobold,nounderscore,noitalics]\ +# #[fg=colour15,bg=colour14] #h \ +# " + +# setw -g window-status-format "\ +# #[fg=colour10,bg=colour0] #I \ +# #[fg=colour10,bg=colour0] #W \ +# " + +# setw -g window-status-current-format "\ +# #[fg=colour0,bg=colour11,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] #I \ +# #[fg=colour7,bg=colour11] #W #[fg=colour11,bg=colour0,nobold,nounderscore,noitalics]\ +# " #}}} # start window numbering at 1, not 0 diff --git a/vimrc b/vimrc @@ -298,12 +298,12 @@ function! InsertStatuslineColor(mode) hi statusline ctermfg=4 ctermbg=15 hi SLgreen ctermfg=236 ctermbg=4 hi SLblue ctermfg=236 ctermbg=4 - hi SLteal ctermfg=236 ctermbg=4 + hi SLcyan ctermfg=236 ctermbg=4 elseif a:mode == 'r' hi statusline ctermfg=9 ctermbg=15 hi SLgreen ctermfg=236 ctermbg=9 hi SLblue ctermfg=236 ctermbg=9 - hi SLteal ctermfg=236 ctermbg=9 + hi SLcyan ctermfg=236 ctermbg=9 else hi statusline ctermfg=236 ctermbg=15 endif @@ -313,19 +313,20 @@ au InsertEnter * call InsertStatuslineColor(v:insertmode) au InsertLeave * hi statusline ctermfg=236 ctermbg=15 au InsertLeave * hi SLgreen ctermfg=2 ctermbg=236 au InsertLeave * hi SLblue ctermfg=4 ctermbg=236 -au InsertLeave * hi SLteal ctermfg=6 ctermbg=236 +au InsertLeave * hi SLcyan ctermfg=6 ctermbg=236 hi statusline ctermfg=236 ctermbg=15 hi SLgreen ctermfg=2 ctermbg=236 hi SLblue ctermfg=4 ctermbg=236 -hi SLteal ctermfg=6 ctermbg=236 +hi SLcyan ctermfg=6 ctermbg=236 -set statusline=%#SLblue#%f " file name -set statusline+=%#SLteal#\ %Y " filetype -set statusline+=%#SLgreen#\ %m " modified flag +set statusline=%#SLblue#%f " file name +set statusline+=%#SLgreen#\ %Y " filetype +set statusline+=%#SLcyan#\ %M " modified flag -set statusline+=\ %= " align left -set statusline+=%#SLteal#[%p%%] " [percent of file] -set statusline+=%#SLblue#\ %l/%L:%c " line:column +set statusline+=\ %= " align left +set statusline+=%#SLcyan#%c " column +set statusline+=%#SLgreen#\ %p%% " percent of file +set statusline+=%#SLblue#\ %l/%L " line/total lines set statusline+=%#ErrorMsg#%{SyntasticStatuslineFlag()} " Syntastic Error