1 files changed, 20 insertions, 117 deletions

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index d071c83..26e74cf 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -5,7 +5,6 @@ Plug 'Shougo/deoplete-clangx'
 Plug 'deoplete-plugins/deoplete-jedi'
 Plug 'Shougo/deol.nvim'
 Plug 'ap/vim-css-color'
-Plug 'luochen1990/rainbow'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-commentary'
 Plug 'scrooloose/nerdtree'
@@ -20,7 +19,7 @@ call plug#end()
 set guicursor=
 set number relativenumber
 set mouse=a
-set background=dark
+set background=light
 syntax enable
 set cursorline
 set ignorecase
@@ -35,7 +34,7 @@ set shiftwidth=4    " number of spaces to use for autoindent
 set expandtab       " tabs are space
 set autoindent
 set copyindent      " copy indent from the previous line
-colorscheme bloodbath
+colorscheme pencil
 "hi Normal ctermbg=16 guibg=#000000
 "hi LineNr ctermbg=16 guibg=#000000
 
@@ -56,9 +55,6 @@ let g:gitgutter_sign_removed                   = '-'
 let g:gitgutter_sign_removed_first_line        = '^'
 let g:gitgutter_sign_modified_removed          = '#'
 
-" rainbow
-let g:rainbow_active = 1
-
 " vim-markdown 
 let g:vim_markdown_no_default_key_mappings=1
 let g:vim_markdown_toml_frontmatter=1
@@ -92,6 +88,12 @@ hi Comment cterm=italic
 scriptencoding utf-8
 
 " statusline
+hi PrimaryBlock   ctermbg=NONE ctermfg=8
+hi ModeBlock      ctermbg=NONE ctermfg=2
+hi SecondaryBlock ctermbg=NONE ctermfg=8
+hi TeritaryBlock  ctermbg=NONE ctermfg=9
+hi Blanks         ctermbg=NONE
+hi statusline     ctermbg=NONE
 let g:currentmode={
             \ 'n'  : 'NORMAL ',
             \ 'no' : 'N·OPERATOR PENDING ',
@@ -112,114 +114,15 @@ let g:currentmode={
             \ 'r?' : 'CONFIRM ',
             \ '!'  : 'SHELL ',
             \ 't'  : 'TERMINAL '}
-
-hi PrimaryBlock       ctermfg=00    ctermbg=6
-hi SecondaryBlock     ctermfg=07    ctermbg=10
-hi Blanks             ctermfg=00    ctermbg=11
-
-hi User1             ctermfg=01    ctermbg=0
-hi User2             ctermfg=02    ctermbg=0
-hi User3             ctermfg=03    ctermbg=0
-hi User4             ctermfg=04    ctermbg=0
-hi User5             ctermfg=05    ctermbg=0
-hi User6             ctermfg=06    ctermbg=0
-hi User7             ctermfg=07    ctermbg=0
-hi User8             ctermfg=08    ctermbg=0
-hi User9             ctermfg=09    ctermbg=0
-
-highlight EndOfBuffer ctermfg=black ctermbg=black
-
-function! GitBranch()
-    return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
-endfunction
-
-function! StatuslineGit()
-    let l:branchname = GitBranch()
-    return strlen(l:branchname) > 0?'* '.l:branchname.'  ':''
-endfunction
-
-function! ReadOnly() abort
-    if !&modifiable && &readonly
-        return ' RO'
-    elseif &modifiable && &readonly
-        return 'RO'
-    elseif !&modifiable && !&readonly
-        return ''
-    else
-        return ''
-    endif
-endfunction
-
-function! Filepath() abort
-    let l:basename = expand('%:h')
-    let l:filename = expand('%:t')
-    let l:extension = expand('%:e')
-    let l:prefix = (l:basename ==# '' || l:basename ==# '.') ?
-                \ '' : substitute(l:basename . '/', '\C^' . $HOME, '~', '')
-
-    if empty(l:prefix) && empty(l:filename)
-        return printf('%%8*%%f%%*%s %%m%%*', '%8*')
-    elseif empty(l:prefix)
-        return printf('%%8*%%f%%*%s %%m%%*', '%6*')
-    else
-        return printf('%%8*%s%%*%s%s%%*', l:prefix, &modified ? '%6*' : '%8*', l:filename)
-    endif
-endfunction
-
-function! LinterStatus() abort
-  let info = get(b:, 'coc_diagnostic_info', {})
-  if empty(info) | return '' | endif
-  let msgs = []
-  if get(info, 'error', 0)
-    call add(msgs, printf('%%5*%s×%%*', info['error']))
-  endif
-  if get(info, 'warning', 0)
-    call add(msgs, printf('%%3*%s!%%*', info['warning']))
-  endif
-  return join(msgs, ' ')
-endfunction
-
-function! StatusLine(mode) abort
-  let l:line=''
-
-  " help or man pages
-  if &filetype ==# 'help' || &filetype ==# 'man'
-    let l:line.=' %#StatusLineNC# ['. &filetype .'] %f '
-    return l:line
-  endif
-
-  " active
-  if a:mode ==# 'active'
-    let l:line.='%7*%{StatuslineGit()}'
-    let l:line.='%<'
-    let l:line.=Filepath()
-
-    let l:line.='%5*'
-    let l:line.=' %{ReadOnly()} %w%*'
-    let l:line.='%9* %=%*'
-
-    let l:line.='%7* %l,%c  %*'
-    let l:line.='%8* %{g:currentmode[mode()]}%*'
-    let l:line.=' '
-    let l:line.=LinterStatus()
-    let l:line.=' '
-    let l:line.='%8*'. &filetype
-
-  else
-    " inactive
-    let l:line.='%#Blanks#'
-    let l:line.='%f %5*%m%*'
-    let l:line.='%#Blanks# %=%*'
-  endif
-
-  let l:line.='%*'
-
-  return l:line
-endfunction
-
-set statusline=%!StatusLine('active')
-augroup MyStatusLine
-  autocmd!
-  autocmd WinEnter * setl statusline=%!StatusLine('active')
-  autocmd WinLeave * setl statusline=%!StatusLine('inactive')
-augroup END
+set statusline=
+set statusline+=%#ModeBlock#
+set statusline+=\ %{g:currentmode[mode()]}
+set statusline+=%#TeritaryBlock#
+set statusline+=\ %f\ 
+set statusline+=%M\ 
+set statusline+=%#Blanks#
+set statusline+=%=
+set statusline+=%#PrimaryBlock#
+set statusline+=\ %Y\ 
+set statusline+=%#SecondaryBlock#
+set statusline+=\ %P\