diff --git a/autoload/justmyrc.vim b/autoload/justmyrc.vim index e25f796..f2c0159 100644 --- a/autoload/justmyrc.vim +++ b/autoload/justmyrc.vim @@ -73,11 +73,6 @@ function justmyrc#LessBehaviour() if (!&modifiable || &ro) set nonumber set nospell - set laststatus=0 set cmdheight=1 endif endfunction - -function justmyrc#GetGitBranch() - return system("git symbolic-ref --short HEAD 2> /dev/null | tr -d '\n'") -endfunction diff --git a/colors/custom_scheme_dark.vim b/colors/custom_scheme_dark.vim index 0eacb34..e72b1b5 100644 --- a/colors/custom_scheme_dark.vim +++ b/colors/custom_scheme_dark.vim @@ -14,7 +14,7 @@ hi LineNr cterm=none ctermfg=241 ctermbg=none hi CursorLineNr cterm=bold ctermfg=250 ctermbg=237 hi CursorLine cterm=none ctermbg=234 hi Folded cterm=none ctermfg=93 ctermbg=none -hi ModeMsg cterm=none ctermfg=0 ctermbg=14 +hi ModeMsg cterm=none ctermfg=0 ctermbg=215 hi NonText ctermfg=215 hi Visual ctermbg=241 hi ColorColumn ctermbg=235 diff --git a/vimrc b/vimrc index 0c860d6..bc2ab40 100644 --- a/vimrc +++ b/vimrc @@ -21,19 +21,18 @@ set hlsearch set wildmenu "Не показывать режим (он отображается в кастомной строке статуса) -set noshowmode +"set noshowmode "Настройки строки статуса set laststatus=2 set statusline= -set statusline+=%#StatusLineEditorMode#\ %{justmyrc#GetMode()}\ -set statusline+=%#StatusLineBranchName#\ %{justmyrc#GetGitBranch()}\ -set statusline+=%#StatusLineFileFormat#%{&ff}\ -set statusline+=%#StatusLineEmpty#%= -set statusline+=%#StatusLineReadOnlyFlag#\ %r\ -set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\ set statusline+=%#StatusLineFileType#\ %{&ft}\ +set statusline+=%#StatusLineFileFormat#\ %{&ff}\ +set statusline+=%#StatusLineEmpty#%= +set statusline+=%#StatusLineReadOnlyFlag#\ %r +set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\ +set statusline+=%#StatusLineFileType#\ %v:%l\ (%p%%)\ "Выключает перенос строк set nowrap