From cf0b38afa81a3ea4bb6a2c479328ad826aa2b87a Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Wed, 17 Jun 2020 18:06:16 +0200 Subject: vim: tweak daymode, move to yui for day theme --- .vim/init.vim | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) (limited to '.vim/init.vim') 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 = ' ' " key to let g:maplocalleader = '\' @@ -14,18 +12,27 @@ runtime plug.vim " nnoremap cc :set cursorcolumn! " 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 gb :bnext nmap gB :bprevious +nmap cb :Clap buffers +nmap cg :Clap grep2 +nmap cl :Clap blines " quickfix jumping -nnoremap cn :cnext -nnoremap cp :cprevious -nnoremap cl :clist +" nnoremap cn :cnext +" nnoremap cp :cprevious +nnoremap cl :Clap quickfix " loclist jumping -nnoremap ln :lnext -nnoremap lp :lprevious -nnoremap ll :llist +" nnoremap ln :lnext +" nnoremap lp :lprevious +nnoremap ll :Clap loclist " escape terminal mode with tnoremap tnoremap qq :bdelete! @@ -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 -- cgit 1.4.1