Add branch name to status bar & change colorscheme
This commit is contained in:
parent
f4ab915b26
commit
9e61320039
4 changed files with 94 additions and 78 deletions
|
|
@ -38,6 +38,12 @@ function justmyrc#GetMode()
|
|||
endif
|
||||
endfunction
|
||||
|
||||
function justmyrc#GetBranchName()
|
||||
let l:status = trim(system("git rev-parse --abbrev-ref HEAD 2> /dev/null | tr -d '\r\n'"))
|
||||
|
||||
return l:status
|
||||
endfunction
|
||||
|
||||
function justmyrc#TabLine()
|
||||
let l:s = ''
|
||||
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
hi clear
|
||||
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
|
||||
set bg=dark
|
||||
let color_name="custom_scheme_dark"
|
||||
|
||||
"=== Цвета псевдоинтерфейса ===
|
||||
"Цвета линейки строк (та, что слева номера строк показыват)
|
||||
hi Normal ctermbg=none
|
||||
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=215
|
||||
hi NonText ctermfg=215
|
||||
hi Visual ctermbg=241
|
||||
hi ColorColumn ctermbg=235
|
||||
|
||||
hi TabLine cterm=None ctermfg=252 ctermbg=235
|
||||
hi TabLineSel cterm=None ctermfg=0 ctermbg=245
|
||||
hi TabLineFill cterm=None ctermfg=None ctermbg=235
|
||||
|
||||
hi StatusLine cterm=None ctermfg=246 ctermbg=234
|
||||
hi WildMenu cterm=None ctermfg=0 ctermbg=246
|
||||
|
||||
hi Pmenu ctermfg=242 ctermbg=233
|
||||
hi PmenuSel ctermfg=7 ctermbg=235
|
||||
|
||||
"Цвета, используемые в статусной строке
|
||||
hi StatusLineEditorMode ctermfg=0 ctermbg=245
|
||||
hi StatusLineBranchName ctermfg=107 ctermbg=235
|
||||
hi StatusLineFileFormat ctermfg=247 ctermbg=235
|
||||
hi StatusLineEmpty ctermbg=235
|
||||
hi StatusLineReadOnlyFlag ctermfg=247 ctermbg=235
|
||||
hi StatusLineEncoding ctermfg=247 ctermbg=235
|
||||
hi StatusLineFileType ctermfg=0 ctermbg=242
|
||||
|
||||
"Netrw
|
||||
hi netrwDir cterm=bold ctermfg=220
|
||||
hi netrwLink cterm=bold ctermfg=99
|
||||
hi netrwSymLink cterm=bold ctermfg=99
|
||||
hi netrwExe cterm=bold ctermfg=2
|
||||
|
||||
"=== Подсвтека синтаксиса ===
|
||||
" для заголовков markdown
|
||||
hi Title cterm=bold ctermfg=189
|
||||
|
||||
hi Comment ctermfg=240
|
||||
|
||||
hi Constant ctermfg=153
|
||||
hi String ctermfg=121
|
||||
hi Number ctermfg=50
|
||||
hi Boolean ctermfg=215
|
||||
|
||||
hi Identifier cterm=none ctermfg=147
|
||||
hi Function ctermfg=153
|
||||
|
||||
hi Statement ctermfg=189
|
||||
|
||||
hi PreProc ctermfg=159
|
||||
hi Include cterm=bold ctermfg=159
|
||||
|
||||
hi Type ctermfg=223
|
||||
|
||||
hi Delimiter ctermfg=189
|
||||
|
||||
hi Special ctermfg=222
|
||||
|
||||
hi Todo cterm=bold ctermfg=255 ctermbg=130
|
||||
hi Error ctermbg=197
|
||||
|
||||
hi diffRemoved ctermbg=1
|
||||
hi diffAdded ctermbg=2
|
||||
hi diffChanged ctermbg=2
|
||||
86
colors/justmyscheme.vim
Normal file
86
colors/justmyscheme.vim
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
hi clear
|
||||
|
||||
if exists("syntax_on")
|
||||
syntax reset
|
||||
endif
|
||||
|
||||
set bg=dark
|
||||
let color_name="justmyscheme"
|
||||
|
||||
"=== Пользовательские цвета ===
|
||||
hi justmyschemeMainColor cterm=none ctermfg=0 ctermbg=35
|
||||
hi justmyschemeSecondColor ctermfg=255 ctermbg=29
|
||||
|
||||
"=== Основного интерфейса интерфейса ===
|
||||
hi Normal ctermbg=none
|
||||
"Цвета линейки строк (та, что слева номера строк показыват)
|
||||
hi LineNr cterm=none ctermfg=245 ctermbg=234
|
||||
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=120
|
||||
hi NonText ctermfg=215
|
||||
hi Visual ctermbg=59
|
||||
hi ColorColumn ctermbg=235
|
||||
|
||||
"=== Строка вкладок ===
|
||||
hi TabLine cterm=none ctermfg=252 ctermbg=235
|
||||
hi TabLineSel cterm=none ctermfg=0 ctermbg=35
|
||||
hi TabLineFill cterm=none ctermfg=None ctermbg=235
|
||||
|
||||
hi WildMenu cterm=none ctermfg=0 ctermbg=246
|
||||
|
||||
hi Pmenu ctermfg=242 ctermbg=233
|
||||
hi PmenuSel ctermfg=7 ctermbg=235
|
||||
|
||||
" Статусная строка
|
||||
hi StatusLine cterm=none ctermfg=246 ctermbg=234
|
||||
hi link StatusLineEditorMode justmyschemeMainColor
|
||||
hi link StatusLineFileType justmyschemeSecondColor
|
||||
hi StatusLineFileFormat ctermfg=247 ctermbg=235
|
||||
hi StatusLineEmpty ctermbg=235
|
||||
hi StatusLineReadOnlyFlag ctermfg=247 ctermbg=235
|
||||
hi StatusLineEncoding ctermfg=247 ctermbg=235
|
||||
hi link StatusLineRuler justmyschemeSecondColor
|
||||
hi link StatusLineBranchName justmyschemeMainColor
|
||||
|
||||
"=== Подсвтека синтаксиса ===
|
||||
" Заголовки Markdown
|
||||
hi Title cterm=bold ctermfg=189
|
||||
" Комментарии в языках программирования
|
||||
hi Comment ctermfg=60
|
||||
|
||||
hi Constant ctermfg=153
|
||||
hi String ctermfg=229
|
||||
hi Number ctermfg=50
|
||||
hi Boolean ctermfg=215
|
||||
|
||||
hi Identifier cterm=none ctermfg=147
|
||||
hi Function ctermfg=153
|
||||
|
||||
hi Statement ctermfg=141
|
||||
|
||||
hi PreProc ctermfg=162
|
||||
hi Include cterm=bold ctermfg=162
|
||||
|
||||
hi Type ctermfg=212
|
||||
|
||||
hi Delimiter ctermfg=189
|
||||
|
||||
hi Special ctermfg=219
|
||||
|
||||
hi Todo cterm=bold ctermfg=154 ctermbg=none
|
||||
hi Error ctermbg=197
|
||||
|
||||
" === Встроенные плагины ===
|
||||
|
||||
" Netrw
|
||||
hi netrwDir cterm=bold ctermfg=220
|
||||
hi netrwLink cterm=bold ctermfg=99
|
||||
hi netrwSymLink cterm=bold ctermfg=99
|
||||
hi netrwExe cterm=bold ctermfg=2
|
||||
|
||||
" Diff
|
||||
hi diffRemoved ctermbg=1
|
||||
hi diffAdded ctermbg=2
|
||||
hi diffChanged ctermbg=2
|
||||
3
vimrc
3
vimrc
|
|
@ -33,7 +33,8 @@ set statusline+=%#StatusLineFileFormat#\ %{&ff}\
|
|||
set statusline+=%#StatusLineEmpty#%=
|
||||
set statusline+=%#StatusLineReadOnlyFlag#\ %r
|
||||
set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\
|
||||
set statusline+=%#StatusLineFileType#\ %v:%l\ (%p%%)\
|
||||
set statusline+=%#StatusLineRuler#\ %v:%l\ (%p%%)\
|
||||
set statusline+=%#StatusLineBranchName#\ %{justmyrc#GetBranchName()}\
|
||||
|
||||
"Выключает перенос строк
|
||||
set nowrap
|
||||
|
|
|
|||
Loading…
Reference in a new issue