update

vim/coc-settings.json

@@ -0,0 +1,6 @@
+{
+  "coc.preferences.triggerAfterInsertEnter": true,
+  "coc.preferences.autoTrigger": "always",
+  "coc.preferences.timeout": 200
+}
+

vim/colors/monotonous-dark.erb

@@ -200,7 +200,7 @@
           [ "Boolean", "String" ],
           [ "Float", "String" ],
 
-          [ "Folded", "NONE", fg_strong3, "NONE" ],
+          [ "Folded", "NONE", fg_strong3, "bold" ],
 
           [ "Statement", "NONE", fg, "NONE" ],
           [ "Conditional", "NONE", fg_strong3, "bold" ],
@@ -213,21 +213,22 @@
           [ "PreProc", "NONE", fg_weak1, "bold" ],
           [ "Include", "NONE", fg_weak1, "NONE" ],
 
-          [ "Comment", "NONE", fg_comment, "italic" ],
+          [ "Comment", "NONE", fg_comment, "bold,italic" ],
           [ "SpecialComment", "NONE", fg_strong1, "italic"],
           [ "Todo", "NONE", fg_strong2, "italic" ],
 
           [ "Ignore", "NONE", bg, "NONE" ],
+          [ "Conceal", "NONE", "NONE", "NONE" ],
 
           [ "Error", "NONE", fg_error, "bold" ],
 
           [ "Underlined", "NONE", "NONE", "underline" ],
 
-          [ "StatusLine", ui_bg, ui_fg_strong3, "NONE" ],
+          [ "StatusLine", ui_bg, ui_fg_strong3, "italic" ],
-          [ "StatusLineNC", ui_bg, ui_fg, "NONE" ],
+          [ "StatusLineNC", ui_bg, ui_fg, "italic" ],
-          [ "TabLine", ui_bg, ui_fg, "NONE" ],
+          [ "TabLine", ui_bg, ui_fg, "italic" ],
-          [ "TabLineFill", ui_bg, ui_bg, "NONE" ],
+          [ "TabLineFill", ui_bg, ui_bg, "italic" ],
-          [ "TabLineSel", ui_bg, ui_fg_strong3, "NONE" ],
+          [ "TabLineSel", ui_bg, ui_fg_strong3, "italic" ],
 
           [ "VertSplit", bg, ui_bg, "NONE" ],
           [ "FoldColumn", bg, fg_weak1, "NONE" ],
@@ -235,7 +236,7 @@
           [ "SignColumn", bg, ui_fg_strong3, "NONE" ],
           [ "CursorLine", bg_cursorline, "NONE", "NONE" ],
 
-          [ "Title", "NONE", fg_strong4, "bold" ],
+          [ "Title", "NONE", fg_strong4, "bold,italic" ],
 
           [ "LineNr", bg, ui_linenr, "NONE" ],
           [ "CursorLineNr", bg, ui_cursorlinenr, "bold" ],
@@ -287,20 +288,20 @@
 
           # tabline, statusline
 
-          [ "TabLineNum", ui_bg, ui_fg, "bold"],
+          [ "TabLineNum", ui_bg, ui_fg, "italic"],
-          [ "TabLineNumSel", ui_bg, ui_fg_strong1, "bold"],
+          [ "TabLineNumSel", ui_bg, ui_fg_strong1, "italic"],
 
 
-          [ "StatusLineNoise", ui_bg, ui_fg_weak2, "NONE"],
+          [ "StatusLineNoise", ui_bg, ui_fg_weak2, "italic"],
-          [ "StatusLineNoiseActive", ui_bg, ui_fg, "NONE"],
+          [ "StatusLineNoiseActive", ui_bg, ui_fg, "italic"],
 
-          [ "StatusLineBufferNr", ui_bg, ui_fg_strong2, "bold"],
+          [ "StatusLineBufferNr", ui_bg, ui_fg_strong2, "italic"],
-          [ "StatusLineBufferNrActive", ui_bg, ui_fg_strong3, "bold"],
+          [ "StatusLineBufferNrActive", ui_bg, ui_fg_strong3, "italic"],
 
-          [ "StatusLinePercent", ui_bg, ui_fg, "bold"],
+          [ "StatusLinePercent", ui_bg, ui_fg, "italic"],
-          [ "StatusLinePercentActive", ui_bg, ui_fg_strong2, "bold"],
+          [ "StatusLinePercentActive", ui_bg, ui_fg_strong2, "italic"],
-          [ "StatusLineLinecount", ui_bg, ui_fg, "bold"],
+          [ "StatusLineLinecount", ui_bg, ui_fg, "italic"],
-          [ "StatusLineLinecountActive", ui_bg, ui_fg_strong1, "bold"],
+          [ "StatusLineLinecountActive", ui_bg, ui_fg_strong1, "italic"],
 
           [ "StatusLineDivActive", ui_fg, ui_fg, "NONE"],
           [ "StatusLineDivInput", ui_statusbar_input, ui_statusbar_input, "NONE"],
@@ -320,8 +321,8 @@
 
           [ "StatusLineFileReadOnly", ui_bg, ui_fg_warning, "italic"],
           [ "StatusLineFileReadOnlyActive", "NONE", ui_fg_warning, "italic"],
-          [ "StatusLineWarning", ui_bg, ui_fg_strong1, "bold"],
+          [ "StatusLineWarning", ui_bg, ui_fg_strong1, "italic"],
-          [ "StatusLineWarningActive", "NONE", ui_fg_warning, "bold"],
+          [ "StatusLineWarningActive", "NONE", ui_fg_warning, "italic"],
 
           [ "LinterDash", "NONE", ui_fg_linter_dash, "NONE"],
           [ "LinterDashActive", "NONE", ui_fg_linter_dash_active, "NONE"],
@@ -344,6 +345,9 @@
           [ "GitGutterAdd", "NONE", ui_sign_add, "bold"],
           [ "GitGutterChangeDelete", "NONE", ui_sign_changedelete, "bold"],
 
+          [ "QuickScopePrimary", "IncSearch" ],
+          [ "QuickScopeSecondary", "Search" ],
+
           # css, scss
 
           [ "cssIdentifier", "NONE", color_secondary, "bold" ],
@@ -380,7 +384,7 @@
 
           ["htmlTagName", "NONE", color_tertiary_weak, "NONE"],
           ["htmlSpecialTagName", "NONE", color_tertiary, "bold"],
-          ["htmlLink", "NONE", color_tertiary_strong, "underline"],
+          ["htmlLink", "NONE", fg_strong3, "italic,underline"],
 
           [ "htmlNormal",          "Normal" ],
 
@@ -429,6 +433,7 @@
           [ "vueTagComponentName", "NONE", indigo3, "bold" ],
           [ "vueDynamicComponent", "NONE", indigo1, "bold" ],
 
+          [ "vueComponentName", "vueTagComponentName" ],
           [ "vueTransitionComponent", "vueDynamicComponent" ],
           [ "vueTransitionName",  "cssIdentifier" ],
           [ "vueTransitionMode",  "String" ],

vimrc

@@ -7,6 +7,7 @@ if empty(glob('~/.vim/autoload/plug.vim'))"{{{
 endif
 "}}}
 
+if !has('nvim')
   call plug#begin('~/.vim/bundle')
 
   " #Activity Watch #aw-watcher-vim{{{
@@ -30,6 +31,10 @@ let g:ale_linters = {'scss': ['stylelint'], 'javascript': [], 'php':['php'], 'ht
   let g:ale_html_htmlhint_options = '-c ~/.htmlhintrc --format=unix'
   let g:ale_fixers = {'javascript': ['eslint']}
 
+  "}}}
+  " #coc.nvim{{{
+  " https://github.com/neoclide/coc.nvim
+  " Plug 'neoclide/coc.nvim', {'tag': '*', 'do': { -> coc#util#install()}}
   "}}}
   " #colorV {{{
   " original:
@@ -360,23 +365,23 @@ nnoremap \ff :LspDocumentFormat<cr>
   nnoremap \fr :LspDocumentRangeFormat<cr>
   augroup User lsp_setup
     autocmd!
-  if executable('vls')
+    if executable('vls') "{{{
       autocmd User lsp_setup call lsp#register_server({
             \ 'name': 'vue',
             \ 'cmd': {server_info->['vls']},
             \ 'whitelist': ['vue'],
             \ })
     endif
-
+  "}}}
-  if executable('pyls')
+    if executable('pyls') "{{{
       autocmd User lsp_setup call lsp#register_server({
             \ 'name': 'pyls',
             \ 'cmd': {server_info->['pyls']},
             \ 'whitelist': ['python'],
             \ })
     endif
-
+  "}}}
-  if executable('typescript-language-server')
+    if executable('typescript-language-server') "{{{
       au User lsp_setup call lsp#register_server({
         \ 'name': 'typescript-language-server',
         \ 'cmd': { server_info->[&shell, &shellcmdflag, 'typescript-language-server --stdio']},
@@ -384,9 +389,10 @@ augroup User lsp_setup
         \ 'whitelist': ['typescript', 'javascript', 'javascript.jsx']
         \ })
     endif
+  "}}}
   augroup END
 
-"}}}
+  ""}}}
   " #vim-repeat{{{
   " https://github.com/tpope/vim-repeat
   Plug 'tpope/vim-repeat'
@@ -459,6 +465,7 @@ Plug 'wakatime/vim-wakatime'
 
   "}}}
   call plug#end()
+endif
 
 runtime macros/matchit.vim
 
@@ -1502,8 +1509,12 @@ if exists('+showtabline')
 
     let l:customtabline .= '%T%#TabLineFill#%='
     let l:customtabline .= '%#TabLineItem# %{getcwd()}%   '
+    if exists("*fugitive#statusline")
       let l:customtabline .= '%#TabLineItem# %{fugitive#statusline()}%   '
+    endif
+    if exists("*ObsessionStatus")
       let l:customtabline .= "%#TabLineItemSel# %{ObsessionStatus(fnamemodify(v:this_session,':t'),'---')} %*"
+    endif
 
     return l:customtabline