vim: tweak daymode, move to yui for day theme

4 files changed, 37 insertions, 25 deletions

diff --git a/.vim/autoload/daymode.vim b/.vim/autoload/daymode.vim
index afac142..40fb5a0 100644
--- a/.vim/autoload/daymode.vim
+++ b/.vim/autoload/daymode.vim
@@ -11,21 +11,15 @@ function! s:lightline_update(colors)
     endtry
 endfunction
 
-let s:day_mode_previous_colorscheme = ''
-let s:day_mode_previous_lightline_colorscheme = ''
-
 function! daymode#switch(bang)
     if a:bang
         set background=dark
-        execute 'colorscheme' s:day_mode_previous_colorscheme
-        call s:lightline_update(s:day_mode_previous_lightline_colorscheme)
+        execute 'colorscheme' get(g:, 'daymode_colorscheme_night', 'default')
+        call s:lightline_update(get(g:, 'daymode_lightline_colorscheme_night', 'PaperColor'))
     else
-        let s:day_mode_previous_colorscheme = g:colors_name
-        let s:day_mode_previous_lightline_colorscheme = g:lightline.colorscheme
-
         set background=light
-        execute 'colorscheme' get(g:, 'day_mode_colorscheme', 'morning')
-        call s:lightline_update(get(g:, 'day_mode_lightline_colorscheme', 'PaperColor_light'))
+        execute 'colorscheme' get(g:, 'daymode_colorscheme_day', 'default')
+        call s:lightline_update(get(g:, 'daymode_lightline_colorscheme_day', 'PaperColor'))
     endif
 
     if exists("syntax_on")
diff --git a/.vim/init.vim b/.vim/init.vim
index 0b81b63..1cc583b 100644
--- a/.vim/init.vim
+++ b/.vim/init.vim
@@ -1,7 +1,5 @@
 " vim: ts=2:sw=2:et:tw=99
 
-" let g:daymode = 1
-
 let g:mapleader = ' ' " <leader> key to <space>
 let g:maplocalleader = '\'
 
@@ -14,18 +12,27 @@ runtime plug.vim
 " nnoremap <Leader>cc :set cursorcolumn!<CR>
 
 " looks {{{
-set background=dark
+let g:daymode = 1
+let g:daymode_colorscheme_day = 'yui'
+let g:daymode_colorscheme_night = 'PaperColor'
+let g:daymode_lightline_colorscheme_day = 'ayu_light'
+let g:daymode_lightline_colorscheme_night = 'papercolor_dim'
+
 let g:PaperColor_Theme_Options = {
 \   'theme': {
 \     'default.dark': {
 \       'allow_bold': 1,
 \       'allow_italic': 1,
-\       'transparent_background': 1,
+\       'transparent_background': 0,
 \     }
 \   }
 \ }
-colorscheme PaperColor
-let g:day_mode_colorscheme = 'PaperColor'
+
+au VimEnter * if exists('g:daymode') && g:daymode
+  \ | call daymode#switch(0)
+  \ | else
+  \ | call daymode#switch(1)
+  \ | endif
 
 " Make comments italic, no matter what the colorscheme does
 hi Comment gui=italic
@@ -44,14 +51,17 @@ cnoreabbrev Q q
 " Buffer commands
 nmap <silent> gb :bnext<CR>
 nmap <silent> gB :bprevious<CR>
+nmap <silent> <leader>cb :Clap buffers<CR>
+nmap <silent> <leader>cg :Clap grep2<CR>
+nmap <silent> <leader>cl :Clap blines<CR>
 " quickfix jumping
-nnoremap <leader>cn :cnext<CR>
-nnoremap <leader>cp :cprevious<CR>
-nnoremap <leader>cl :clist<CR>
+" nnoremap <leader>cn :cnext<CR>
+" nnoremap <leader>cp :cprevious<CR>
+nnoremap <leader>cl :Clap quickfix<CR>
 " loclist jumping
-nnoremap <leader>ln :lnext<CR>
-nnoremap <leader>lp :lprevious<CR>
-nnoremap <leader>ll :llist<CR>
+" nnoremap <leader>ln :lnext<CR>
+" nnoremap <leader>lp :lprevious<CR>
+nnoremap <leader>ll :Clap loclist<CR>
 " escape terminal mode with <esc>
 tnoremap <esc> <C-\><C-n>
 tnoremap <leader>qq <C-\><C-n>:bdelete!<CR>
@@ -218,6 +228,15 @@ let g:neoformat_basic_format_trim = 0
 let g:neoformat_only_msg_on_error = 1
 " }}}2
 
+" let g:clap_insert_mode_only = v:true
+let g:clap_popup_border = 'sharp'
+let g:clap_layout = {
+\ 'relative': 'editor',
+\ 'row': '2%', 'col': '0%',
+\ 'width': '100%', 'height': '10%',
+\ }
+let g:clap_multi_selection_warning_silent = 1
+
 let g:neoterm_size = 20
 let g:neoterm_autoinsert = 1
 
@@ -328,7 +347,6 @@ augroup Init
   au VimEnter * set iskeyword-=-
   " au VimEnter * call vista#RunForNearestMethodOrFunction()
   " au VimEnter * Vista!!
-  au VimEnter * if exists('g:daymode') && g:daymode | call daymode#switch(0) | endif
 
   " vim was opened as diff tool, load the 'diff' ftplugin conf
   au VimEnter * if &diff | runtime after/ftplugin/diff.vim | endif
diff --git a/.vim/plug.vim b/.vim/plug.vim
index 64ca543..131fb59 100644
--- a/.vim/plug.vim
+++ b/.vim/plug.vim
@@ -35,7 +35,7 @@ call plug#begin('~/.vim/plugged')
   " Plug 'lotabout/skim',
   "   \ { 'on': 'SK', 'dir': '~/.skim', 'do': './install'}
 
-  Plug 'liuchengxu/vim-clap' " interactive finder / dispatcher
+  Plug 'liuchengxu/vim-clap', { 'do': ':Clap install-binary!' } " interactive finder / dispatcher
 
 " Misc
   Plug 'junegunn/vim-easy-align',
@@ -79,6 +79,7 @@ call plug#begin('~/.vim/plugged')
 
 " Colorschemes
   Plug 'NLKNguyen/papercolor-theme'
+  Plug 'cideM/yui'
 
 " Local
   " Plug '~/devel/projects/nihon-theme/vim'
diff --git a/.vim/plugin/line.vim b/.vim/plugin/line.vim
index 2707175..ad25cab 100644
--- a/.vim/plugin/line.vim
+++ b/.vim/plugin/line.vim
@@ -1,5 +1,4 @@
 let g:lightline = {}
-let g:lightline.colorscheme = 'papercolor_dim'
 
 let g:lightline.enable = { 'statusline': 1, 'tabline': 0 }