diff --git a/.vimrc b/.vimrc index 893fc5d..9304717 100644 --- a/.vimrc +++ b/.vimrc @@ -76,21 +76,28 @@ set statusline+=%#NormalColor#%{(mode()=='n')?'\ \ NORMAL\ \ ':''} set statusline+=%#InsertColor#%{(mode()=='i')?'\ \ INSERT\ \ ':''} set statusline+=%#VisualColor#%{(mode()=='v')?'\ \ VISUAL\ \ ':''} set statusline+=%#CommandColor#%{(mode()=='c')?'\ \ COMMAND\ ':''} -set statusline+=%#NormalColor# -set statusline+=%f " file name -set statusline+=[%{strlen(&fenc)?&fenc:'none'}, "file encoding -set statusline+=%{&ff}] "file format -set statusline+=%y "filetype -set statusline+=%h "help file flag -set statusline+=[%{getbufvar(bufnr('%'),'&mod')?'modified':'saved'}] -"modified flag -set statusline+=%r "read only flag -set statusline+=\ %= " align left -set statusline+=Line:%l/%L[%p%%] " line X of Y [percent of file] -set statusline+=\ Col:%c " current column -"set statusline+=\ Buf:%n " Buffer number -set statusline+=\ [0x%B]\ " ASCII and byte code under cursor +function! GitBranch() + return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'") +endfunction +function! StatuslineGit() + let l:branchname = GitBranch() + return strlen(l:branchname) > 0?' '.l:branchname.' ':'' +endfunction + +set statusline+=%#PmenuSel# " Statusline format PmenuSel +set statusline+=%{StatuslineGit()} " Git status +set statusline+=%#NormalColor# " Statusline format NormalColor +set statusline+=\ %f " Filename +set statusline+=\ %m " Modified token +set statusline+=%= " Allign right +set statusline+=%#CursorColumn# " Statusline format CursorColumn +set statusline+=\ %y " file type +set statusline+=\ %{&fileencoding?&fileencoding:&encoding} " encoding +set statusline+=\[%{&fileformat}\] " file format +set statusline+=\ %p%% " line percent +set statusline+=\ %l:%c " line:column +set statusline+=\ [0x%B]\ " ASCII hex code under cursor " Always show cursor position. "set ruler