Update status line & color scheme
This commit is contained in:
parent
d96ee27a6e
commit
eebefa0120
3 changed files with 46 additions and 38 deletions
|
@ -77,3 +77,13 @@ function justmyrc#LessBehaviour()
|
|||
set cmdheight=1
|
||||
endif
|
||||
endfunction
|
||||
|
||||
" CRITICAL! Bottom code add glitches!
|
||||
function justmyrc#GetGitBranch()
|
||||
return trim(system("git rev-parse --abbrev-ref HEAD 2> /dev/null | tr -d '\n'"))
|
||||
endfunction
|
||||
|
||||
function justmyrc#StatuslineGitBranch()
|
||||
let l:branch_name = justmyrc#GitBranch()
|
||||
return strlen(l:branch_name) > 0?' ' . l:branch_name:''
|
||||
endfunction
|
||||
|
|
|
@ -9,54 +9,54 @@ let color_name="custom_scheme_dark"
|
|||
|
||||
"=== Цвета псевдоинтерфейса ===
|
||||
"Цвета линейки строк (та, что слева номера строк показыват)
|
||||
hi Normal ctermbg=none guifg=#ffffff guibg=#131313
|
||||
hi LineNr cterm=none ctermfg=241 ctermbg=none gui=none guifg=#626262 guibg=#131313
|
||||
hi CursorLineNr cterm=bold ctermfg=250 ctermbg=237 gui=bold guifg=#bcbcbc guibg=#3a3a3a
|
||||
hi CursorLine cterm=none gui=none guibg=#131313
|
||||
hi Folded cterm=none ctermfg=93 ctermbg=none gui=none guifg=#8700ff guibg=#131313
|
||||
hi ModeMsg cterm=none ctermfg=0 ctermbg=14 gui=none guifg=#000000 guibg=#00ffff
|
||||
hi NonText ctermfg=215 guifg=#ffaf5f
|
||||
hi Visual ctermbg=241 guibg=#626262
|
||||
hi ColorColumn ctermbg=235 guibg=#262626
|
||||
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=14
|
||||
hi NonText ctermfg=215
|
||||
hi Visual ctermbg=241
|
||||
hi ColorColumn ctermbg=235
|
||||
|
||||
hi TabLine cterm=None ctermfg=252 ctermbg=236 gui=none guifg=#d0d0d0 guibg=#303030
|
||||
hi TabLineSel cterm=None ctermfg=0 ctermbg=208 gui=none guifg=#000000 guibg=#ff8700
|
||||
hi TabLineFill cterm=None ctermfg=None ctermbg=236 gui=none guifg=#131313 guibg=#303030
|
||||
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 WildMenu cterm=None ctermfg=0 ctermbg=83 gui=none guifg=#000000 guibg=#5fff5f
|
||||
hi WildMenu cterm=None ctermfg=0 ctermbg=83
|
||||
|
||||
"Цвета, используемые в статусной строке
|
||||
hi StatusLineEditorMode ctermfg=0 ctermbg=190 guifg=#000000 guibg=#d7ff00
|
||||
hi StatusLineFileName cterm=bold ctermfg=252 ctermbg=236 gui=bold guifg=#d0d0d0 guibg=#303030
|
||||
hi StatusLineFileFormat ctermfg=247 ctermbg=236 guifg=#9e9e9e guibg=#303030
|
||||
hi StatusLineEmpty ctermbg=236 guibg=#303030
|
||||
hi StatusLineReadOnlyFlag ctermfg=247 ctermbg=236 guifg=#9e9e9e guibg=#303030
|
||||
hi StatusLineEncoding ctermfg=247 ctermbg=236 guifg=#9e9e9e guibg=#303030
|
||||
hi StatusLineFileType cterm=bold ctermfg=252 ctermbg=236 gui=bold guifg=#d0d0d0 guibg=#303030
|
||||
hi StatusLinePosition ctermfg=0 ctermbg=190 guifg=#000000 guibg=#d7ff00
|
||||
hi StatusLineEditorMode ctermfg=0 ctermbg=245
|
||||
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=245
|
||||
|
||||
"=== Подсвтека синтаксиса ===
|
||||
" для заголовков markdown
|
||||
hi Title cterm=bold ctermfg=171 gui=bold guifg=#d75fd7
|
||||
hi Title cterm=bold ctermfg=189
|
||||
|
||||
hi Comment ctermfg=248 guifg=#a8a8a8
|
||||
hi Comment ctermfg=240
|
||||
|
||||
hi Constant ctermfg=153 guifg=#afd7ff
|
||||
hi String ctermfg=43 guifg=#00d7af
|
||||
hi Number ctermfg=50 guifg=#00ffd7
|
||||
hi Boolean ctermfg=197 guifg=#ff005f
|
||||
hi Constant ctermfg=153
|
||||
hi String ctermfg=121
|
||||
hi Number ctermfg=50
|
||||
hi Boolean ctermfg=215
|
||||
|
||||
hi Identifier cterm=none ctermfg=147 gui=none guifg=#afafff
|
||||
hi Function ctermfg=45 guifg=#00d7ff
|
||||
hi Identifier cterm=none ctermfg=147
|
||||
hi Function ctermfg=153
|
||||
|
||||
hi Statement ctermfg=171 guifg=#d75fd7
|
||||
hi Statement ctermfg=189
|
||||
|
||||
hi PreProc ctermfg=47 guifg=#00ff5f
|
||||
hi Include cterm=bold ctermfg=47 gui=bold guifg=#00ff5f
|
||||
hi PreProc ctermfg=159
|
||||
hi Include cterm=bold ctermfg=159
|
||||
|
||||
hi Type ctermfg=203 guifg=#ff5f5f
|
||||
hi Type ctermfg=223
|
||||
|
||||
hi Delimiter ctermfg=171 guifg=#d75fd7
|
||||
hi Delimiter ctermfg=189
|
||||
|
||||
hi Todo cterm=bold ctermfg=0 ctermbg=186 gui=bold guifg=#000000 guibg=#d7d75f
|
||||
hi Error ctermbg=197 guibg=#ff005f
|
||||
hi Special ctermfg=222
|
||||
|
||||
hi Todo cterm=bold ctermfg=0 ctermbg=186
|
||||
hi Error ctermbg=197
|
||||
|
|
2
vimrc
2
vimrc
|
@ -28,13 +28,11 @@ set laststatus=2
|
|||
|
||||
set statusline=
|
||||
set statusline+=%#StatusLineEditorMode#\ %{justmyrc#GetMode()}\
|
||||
set statusline+=%#StatusLineFileName#\ %f\
|
||||
set statusline+=%#StatusLineFileFormat#\ %{&ff}\
|
||||
set statusline+=%#StatusLineEmpty#%=
|
||||
set statusline+=%#StatusLineReadOnlyFlag#\ %r\
|
||||
set statusline+=%#StatusLineEncoding#\ %{&fileencoding?&fileencoding:&encoding}\
|
||||
set statusline+=%#StatusLineFileType#\ %{&ft}\
|
||||
set statusline+=%#StatusLinePosition#\ %p%%\ %l:%c\
|
||||
|
||||
"Выключает перенос строк
|
||||
set nowrap
|
||||
|
|
Loading…
Reference in a new issue