dots
/
nvim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: dots:8fa8075e6f61003b6ab5bc2aa60d405dad1c1c31
Branches Tags
dots:master
dots:no-tree
dots:nvim0.5
..
compare: dots:1793bbdf23d3081b16ae45dcda8d0586784a6c16
Branches Tags
dots:no-tree
dots:master
dots:nvim0.5

No commits in common. "8fa8075e6f61003b6ab5bc2aa60d405dad1c1c31" and "1793bbdf23d3081b16ae45dcda8d0586784a6c16" have entirely different histories.
8fa8075e6f ... 1793bbdf23

4 changed files with 74 additions and 72 deletions
Show Stats Expand all files Collapse all files

35
colors/paper-custom.erb
View File

@ -18,29 +18,29 @@
fg = ["#8c8c8c", 243, "gray"]
fg_strong = ["#777777", 232, "gray"]
# color_primary_weak = ["#76799d", 124, "red"]
# color_primary = ["#5d5f7b", 88, "darkred"]
# color_primary_strong = ["#444762", 52, "darkred"]
color_primary_weak = ["#e846ac", 164, "magenta"]
color_primary = ["#d70087", 164, "magenta"]
color_primary_strong = ["#ad006d", 164, "magenta"]
color_primary_weak = ["#76799d", 124, "red"]
color_primary = ["#5d5f7b", 88, "darkred"]
color_primary_strong = ["#444762", 52, "darkred"]
color_2_weak = ["#5e955e", 28, "darkgreen"]
color_2 = ["#008700", 22, "darkgreen"]
color_2_strong = ["#005a00", 22, "darkgreen"]
# color_3_weak = ["#78b7d5", 20, "blue"]
# color_3 = ["#56acd7", 19, "blue"]
# color_3_strong = ["#1596d7", 17, "darkblue"]
color_3_weak = ["#2d78b7", 20, "blue"]
color_3 = ["#005faf", 19, "blue"]
color_3_strong = ["#004f92", 17, "darkblue"]
color_4_weak = ["#78b7d5", 20, "blue"]
color_4 = ["#56acd7", 19, "blue"]
color_4_strong = ["#1596d7", 17, "darkblue"]
color_4_weak = ["#898fcb", 20, "blue"]
color_4 = ["#7e84c6", 19, "darkblue"]
color_4_strong = ["#5c6191", 17, "darkblue"]
color_5_weak = ["#898fcb", 20, "blue"]
color_5 = ["#7e84c6", 19, "darkblue"]
color_5_strong = ["#5c6191", 17, "darkblue"]
color_5_weak = ["#e846ac", 164, "magenta"]
color_5 = ["#d70087", 164, "magenta"]
color_5_strong = ["#ad006d", 164, "magenta"]
fg_error = ["#d70000", 196, "red"]
fg_spellcap = ["#d75f00", 166, "yellow"]
@ -127,12 +127,7 @@
[ "StatusLineNC", ui_bg, ui_fg, "italic" ],
[ "TabLine", "StatusLineNc" ],
[ "TabLineSel", "StatusLine" ],
[ "TabLineNumSel", "StatusLine"],
# used in init.tabline.vim
[ "TabLineFill", ui_bg, ui_bg, "italic" ],
[ "TabLineItem", ui_bg, ui_fg, "italic" ],
[ "TabLineItemSel", ui_bg, ui_fg_strong, "italic" ],
[ "VertSplit", bg, ui_bg, "NONE" ],
[ "FoldColumn", bg, fg_weak, "NONE" ],
@ -180,6 +175,10 @@
[ "Noise", "NONE", ui_fg_weak, "NONE"],
[ "TabLineNum", "StatusLineNc"],
[ "TabLineNumSel", "StatusLine"],
[ "QuickScopePrimary", "IncSearch" ],
[ "QuickScopeSecondary", "Pmenu" ],

80
colors/paper-custom.vim
View File

@ -22,13 +22,13 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi GitGutterChangeDelete ctermbg=NONE ctermfg=126 cterm=bold guibg=NONE guifg=#5c4a5a gui=bold
hi Normal ctermbg=234 ctermfg=243 cterm=NONE guibg=#ffffff guifg=#8c8c8c gui=NONE
set background=light
hi Special ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#ad006d gui=bold
hi NonText ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#ad006d gui=NONE
hi Tag ctermbg=164 ctermfg=NONE cterm=NONE guibg=#e846ac guifg=NONE gui=NONE
hi Identifier ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#d70087 gui=bold
hi Function ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#d70087 gui=NONE
hi Type ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#e846ac gui=bold
hi StorageClass ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#e846ac gui=NONE
hi Special ctermbg=NONE ctermfg=52 cterm=bold guibg=NONE guifg=#444762 gui=bold
hi NonText ctermbg=NONE ctermfg=52 cterm=NONE guibg=NONE guifg=#444762 gui=NONE
hi Tag ctermbg=124 ctermfg=NONE cterm=NONE guibg=#76799d guifg=NONE gui=NONE
hi Identifier ctermbg=NONE ctermfg=88 cterm=bold guibg=NONE guifg=#5d5f7b gui=bold
hi Function ctermbg=NONE ctermfg=88 cterm=NONE guibg=NONE guifg=#5d5f7b gui=NONE
hi Type ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#76799d gui=bold
hi StorageClass ctermbg=NONE ctermfg=124 cterm=NONE guibg=NONE guifg=#76799d gui=NONE
hi link Structure StorageClass
hi link TypeDef StorageClass
hi Constant ctermbg=NONE ctermfg=232 cterm=italic guibg=NONE guifg=#777777 gui=italic
@ -44,7 +44,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi Label ctermbg=NONE ctermfg=232 cterm=bold guibg=NONE guifg=#777777 gui=bold
hi Operator ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#9d9d9d gui=NONE
hi Keyword ctermbg=NONE ctermfg=232 cterm=NONE guibg=NONE guifg=#777777 gui=NONE
hi Exception ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#e846ac gui=bold
hi Exception ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#76799d gui=bold
hi PreProc ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#9d9d9d gui=bold
hi Include ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#9d9d9d gui=NONE
hi Comment ctermbg=NONE ctermfg=238 cterm=bold,italic guibg=NONE guifg=#9d9d9d gui=bold,italic
@ -58,10 +58,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi StatusLineNC ctermbg=238 ctermfg=243 cterm=italic guibg=#efefef guifg=#929292 gui=italic
hi link TabLine StatusLineNc
hi link TabLineSel StatusLine
hi link TabLineNumSel StatusLine
hi TabLineFill ctermbg=238 ctermfg=238 cterm=italic guibg=#efefef guifg=#efefef gui=italic
hi TabLineItem ctermbg=238 ctermfg=243 cterm=italic guibg=#efefef guifg=#929292 gui=italic
hi TabLineItemSel ctermbg=238 ctermfg=255 cterm=italic guibg=#efefef guifg=#555555 gui=italic
hi VertSplit ctermbg=234 ctermfg=238 cterm=NONE guibg=#ffffff guifg=#efefef gui=NONE
hi FoldColumn ctermbg=234 ctermfg=238 cterm=NONE guibg=#ffffff guifg=#9d9d9d gui=NONE
hi ColorColumn ctermbg=250 ctermfg=NONE cterm=NONE guibg=#f7f2f2 guifg=NONE gui=NONE
@ -74,7 +71,7 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi PmenuSbar ctermbg=238 ctermfg=243 cterm=NONE guibg=#efefef guifg=#929292 gui=NONE
hi PmenuSel ctermbg=238 ctermfg=255 cterm=bold guibg=#efefef guifg=#555555 gui=bold
hi PmenuThumb ctermbg=238 ctermfg=243 cterm=NONE guibg=#efefef guifg=#929292 gui=NONE
hi SpecialKey ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#ad006d gui=NONE
hi SpecialKey ctermbg=NONE ctermfg=52 cterm=NONE guibg=NONE guifg=#444762 gui=NONE
hi IncSearch ctermbg=17 ctermfg=234 cterm=NONE guibg=#beced5 guifg=#ffffff gui=NONE
hi Search ctermbg=17 ctermfg=255 cterm=NONE guibg=#dce5ed guifg=#555555 gui=NONE
hi Visual ctermbg=17 ctermfg=NONE cterm=NONE guibg=#ced8e0 guifg=NONE gui=NONE
@ -94,6 +91,8 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi CursorColumn ctermbg=250 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE gui=NONE
hi EndOfBuffer ctermbg=234 ctermfg=234 cterm=NONE guibg=#ffffff guifg=#ffffff gui=NONE
hi Noise ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#bbbbbb gui=NONE
hi link TabLineNum StatusLineNc
hi link TabLineNumSel StatusLine
hi link QuickScopePrimary IncSearch
hi link QuickScopeSecondary Pmenu
hi cssIdentifier ctermbg=NONE ctermfg=22 cterm=bold guibg=NONE guifg=#008700 gui=bold
@ -166,10 +165,10 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi link htmlDataValue Constant
hi link htmlHrefArg htmlArg
hi link htmlHrefValue htmlSrcValue
hi vueSpecial ctermbg=NONE ctermfg=17 cterm=bold guibg=NONE guifg=#1596d7 gui=bold
hi vueTagSpecial ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#56acd7 gui=bold
hi vueTagComponentName ctermbg=NONE ctermfg=20 cterm=NONE guibg=NONE guifg=#78b7d5 gui=NONE
hi vueDynamicComponent ctermbg=NONE ctermfg=20 cterm=bold guibg=NONE guifg=#78b7d5 gui=bold
hi vueSpecial ctermbg=NONE ctermfg=17 cterm=bold guibg=NONE guifg=#5c6191 gui=bold
hi vueTagSpecial ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#7e84c6 gui=bold
hi vueTagComponentName ctermbg=NONE ctermfg=20 cterm=NONE guibg=NONE guifg=#898fcb gui=NONE
hi vueDynamicComponent ctermbg=NONE ctermfg=20 cterm=bold guibg=NONE guifg=#898fcb gui=bold
hi link vueSlotName Constant
hi link vueComponentName vueTagComponentName
hi link vueTransitionComponent vueDynamicComponent
@ -220,12 +219,12 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
hi pythonSelf ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#9d9d9d gui=bold
hi link JinjaVarBlock Noise
hi link JinjaTagBlock JinjaVarBlock
hi jinjaSpecial ctermbg=NONE ctermfg=17 cterm=bold guibg=NONE guifg=#5c6191 gui=bold
hi jinjaRaw ctermbg=NONE ctermfg=17 cterm=NONE guibg=NONE guifg=#5c6191 gui=NONE
hi jinjaStatement ctermbg=NONE ctermfg=19 cterm=NONE guibg=NONE guifg=#7e84c6 gui=NONE
hi jinjaFilter ctermbg=NONE ctermfg=20 cterm=NONE guibg=NONE guifg=#898fcb gui=NONE
hi jinjaBlockName ctermbg=NONE ctermfg=20 cterm=NONE guibg=NONE guifg=#898fcb gui=NONE
hi jinjaVariable ctermbg=NONE ctermfg=19 cterm=NONE guibg=NONE guifg=#7e84c6 gui=NONE
hi jinjaSpecial ctermbg=NONE ctermfg=164 cterm=bold guibg=NONE guifg=#ad006d gui=bold
hi jinjaRaw ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#ad006d gui=NONE
hi jinjaStatement ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#d70087 gui=NONE
hi jinjaFilter ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#e846ac gui=NONE
hi jinjaBlockName ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#e846ac gui=NONE
hi jinjaVariable ctermbg=NONE ctermfg=164 cterm=NONE guibg=NONE guifg=#d70087 gui=NONE
hi link jinjaString String
hi link jinjaNumber Number
hi link jinjaOperator Noise
@ -336,13 +335,13 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi GitGutterChangeDelete ctermbg=NONE ctermfg=magenta cterm=bold
hi Normal ctermbg=black ctermfg=gray cterm=NONE
set background=light
hi Special ctermbg=NONE ctermfg=magenta cterm=bold
hi NonText ctermbg=NONE ctermfg=magenta cterm=NONE
hi Tag ctermbg=magenta ctermfg=NONE cterm=NONE
hi Identifier ctermbg=NONE ctermfg=magenta cterm=bold
hi Function ctermbg=NONE ctermfg=magenta cterm=NONE
hi Type ctermbg=NONE ctermfg=magenta cterm=bold
hi StorageClass ctermbg=NONE ctermfg=magenta cterm=NONE
hi Special ctermbg=NONE ctermfg=darkred cterm=bold
hi NonText ctermbg=NONE ctermfg=darkred cterm=NONE
hi Tag ctermbg=red ctermfg=NONE cterm=NONE
hi Identifier ctermbg=NONE ctermfg=darkred cterm=bold
hi Function ctermbg=NONE ctermfg=darkred cterm=NONE
hi Type ctermbg=NONE ctermfg=red cterm=bold
hi StorageClass ctermbg=NONE ctermfg=red cterm=NONE
hi link Structure StorageClass
hi link TypeDef StorageClass
hi Constant ctermbg=NONE ctermfg=gray cterm=italic
@ -358,7 +357,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi Label ctermbg=NONE ctermfg=gray cterm=bold
hi Operator ctermbg=NONE ctermfg=gray cterm=NONE
hi Keyword ctermbg=NONE ctermfg=gray cterm=NONE
hi Exception ctermbg=NONE ctermfg=magenta cterm=bold
hi Exception ctermbg=NONE ctermfg=red cterm=bold
hi PreProc ctermbg=NONE ctermfg=gray cterm=bold
hi Include ctermbg=NONE ctermfg=gray cterm=NONE
hi Comment ctermbg=NONE ctermfg=gray cterm=bold,italic
@ -372,10 +371,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi StatusLineNC ctermbg=gray ctermfg=gray cterm=italic
hi link TabLine StatusLineNc
hi link TabLineSel StatusLine
hi link TabLineNumSel StatusLine
hi TabLineFill ctermbg=gray ctermfg=gray cterm=italic
hi TabLineItem ctermbg=gray ctermfg=gray cterm=italic
hi TabLineItemSel ctermbg=gray ctermfg=white cterm=italic
hi VertSplit ctermbg=black ctermfg=gray cterm=NONE
hi FoldColumn ctermbg=black ctermfg=gray cterm=NONE
hi ColorColumn ctermbg=white ctermfg=NONE cterm=NONE
@ -388,7 +384,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi PmenuSbar ctermbg=gray ctermfg=gray cterm=NONE
hi PmenuSel ctermbg=gray ctermfg=white cterm=bold
hi PmenuThumb ctermbg=gray ctermfg=gray cterm=NONE
hi SpecialKey ctermbg=NONE ctermfg=magenta cterm=NONE
hi SpecialKey ctermbg=NONE ctermfg=darkred cterm=NONE
hi IncSearch ctermbg=darkblue ctermfg=black cterm=NONE
hi Search ctermbg=darkblue ctermfg=white cterm=NONE
hi Visual ctermbg=darkblue ctermfg=NONE cterm=NONE
@ -408,6 +404,8 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi CursorColumn ctermbg=white ctermfg=NONE cterm=NONE
hi EndOfBuffer ctermbg=black ctermfg=black cterm=NONE
hi Noise ctermbg=NONE ctermfg=gray cterm=NONE
hi link TabLineNum StatusLineNc
hi link TabLineNumSel StatusLine
hi link QuickScopePrimary IncSearch
hi link QuickScopeSecondary Pmenu
hi cssIdentifier ctermbg=NONE ctermfg=darkgreen cterm=bold
@ -481,7 +479,7 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi link htmlHrefArg htmlArg
hi link htmlHrefValue htmlSrcValue
hi vueSpecial ctermbg=NONE ctermfg=darkblue cterm=bold
hi vueTagSpecial ctermbg=NONE ctermfg=blue cterm=bold
hi vueTagSpecial ctermbg=NONE ctermfg=darkblue cterm=bold
hi vueTagComponentName ctermbg=NONE ctermfg=blue cterm=NONE
hi vueDynamicComponent ctermbg=NONE ctermfg=blue cterm=bold
hi link vueSlotName Constant
@ -534,12 +532,12 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
hi pythonSelf ctermbg=NONE ctermfg=gray cterm=bold
hi link JinjaVarBlock Noise
hi link JinjaTagBlock JinjaVarBlock
hi jinjaSpecial ctermbg=NONE ctermfg=darkblue cterm=bold
hi jinjaRaw ctermbg=NONE ctermfg=darkblue cterm=NONE
hi jinjaStatement ctermbg=NONE ctermfg=darkblue cterm=NONE
hi jinjaFilter ctermbg=NONE ctermfg=blue cterm=NONE
hi jinjaBlockName ctermbg=NONE ctermfg=blue cterm=NONE
hi jinjaVariable ctermbg=NONE ctermfg=darkblue cterm=NONE
hi jinjaSpecial ctermbg=NONE ctermfg=magenta cterm=bold
hi jinjaRaw ctermbg=NONE ctermfg=magenta cterm=NONE
hi jinjaStatement ctermbg=NONE ctermfg=magenta cterm=NONE
hi jinjaFilter ctermbg=NONE ctermfg=magenta cterm=NONE
hi jinjaBlockName ctermbg=NONE ctermfg=magenta cterm=NONE
hi jinjaVariable ctermbg=NONE ctermfg=magenta cterm=NONE
hi link jinjaString String
hi link jinjaNumber Number
hi link jinjaOperator Noise

13
init.tabline.vim
View File

@ -52,9 +52,15 @@ function! MyTabLine() "{{{
let l:customtabline .= '%T%#TabLineFill#%='
if exists('*gutentags#statusline')
let l:customtabline .= '%#TabLineItemSel# %{gutentags#statusline("[ ", " ☢ ] ")}'
endif
let l:customtabline .= '%#TabLineItem# %{getcwd()}% '
if exists('*fugitive#statusline')
let l:customtabline .= '%#TabLineItem# %{fugitive#statusline()}% '
endif
if exists('*ObsessionStatus')
let l:customtabline .= "%#TabLineItem# %{ObsessionStatus(fnamemodify(v:this_session,':t'),'---')} %*"
let l:customtabline .= "%#TabLineItemSel# %{ObsessionStatus(fnamemodify(v:this_session,':t'),'---')} %*"
endif
return l:customtabline
@ -62,6 +68,11 @@ function! MyTabLine() "{{{
endfunction
"}}}
hi def link TabLineItem TabLine
hi def link TabLineItemSel TabLineSel
hi def link TabLineNum TabLine
hi def link TabLineNumSel TabLineSel
set tabline=%!MyTabLine()
set showtabline=2

18
init.vim
View File

@ -256,10 +256,12 @@ set autoindent
set formatoptions=cq
set wrapmargin=0
setlocal cursorline
set cursorline
set foldcolumn=2
set signcolumn=yes
if has('patch-7-4-2201')
set signcolumn=yes
endif
set colorcolumn=80,120
set iskeyword+=-
@ -289,20 +291,12 @@ set listchars=eol:¬,tab:│\ ,trail:~,extends:>,precedes:<,space:·
set fillchars=stl:\ ,stlnc:\ ,vert:┃,fold:\
set statusline=\
" buffer number
set statusline+=[%n]\ \
" line of total_lines
set statusline+=%l\ of\ %L\
" percentage through file
set statusline+=(%p%%)\
" column
set statusline+=:%c\
" virtual column
set statusline+=%((%V)%)
" separator
set statusline+=(%p%%)
set statusline+=%=
set statusline+=%y\
set statusline+=%r\ %m\ %f
set statusline+=%r\ %m\ %F
set statusline+=\
set conceallevel=0