diff --git a/gvimrc b/gvimrc index 7bb7506..102c365 100644 --- a/gvimrc +++ b/gvimrc @@ -4,7 +4,10 @@ if has('win32') else set guifont=Fantasque\ Sans\ Mono\ 11 endif -let g:lightline = { 'colorscheme': 'solarized', } +if exists("g:lightline") + unlet g:lightline.separator + unlet g:lightline.subseparator +endif set guiheadroom=0 guioptions=aei mouse=a set noerrorbells visualbell t_vb= set guicursor=a:blinkon0,a:block,i:ver1-Cursor/lCursor,r:hor1-Cursor/lCursor diff --git a/vimplugins b/vimplugins index 424ce51..22e1e06 100644 --- a/vimplugins +++ b/vimplugins @@ -23,6 +23,7 @@ Plug 'w0rp/ale', { 'for': 'python' } " colorschemes Plug 'lifepillar/vim-solarized8' Plug 'KeitaNakamura/neodark.vim' +Plug 'nanotech/jellybeans.vim' " syntax highlight plugins Plug 'sheerun/vim-polyglot' @@ -36,11 +37,10 @@ call plug#end() " lightline options set noshowmode let g:solarized_termcolors = 16 -let g:lightline = { - \ 'colorscheme': 'solarized', - \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, - \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }, - \ } +let g:lightline = {} +let g:lightline.colorscheme = 'solarized' +let g:lightline.separator = { 'left': "\ue0b0", 'right': "\ue0b2" } +let g:lightline.subseparator = { 'left': "\ue0b1", 'right': "\ue0b3" } " signify options let g:signify_vcs_list=[ 'git' ] diff --git a/zshrc b/zshrc index 87fc1a0..9ee1485 100644 --- a/zshrc +++ b/zshrc @@ -200,14 +200,14 @@ font_colors() { } # grc colorize() { - local cmds cmd - cmds=(\ - cc configure cvs df diff dig gcc gmake id ip last lsof make mount \ - mtr netstat ping ping6 ps tcpdump traceroute traceroute6 \ - ) - for cmd in $cmds[@]; do - alias $cmd="command grc -es --colour=auto $cmd" - done + local cmds cmd + cmds=(\ + cc configure cvs df diff dig gcc gmake id ip last lsof make mount \ + mtr netstat ping ping6 ps tcpdump traceroute traceroute6 \ + ) + for cmd in $cmds[@]; do + alias $cmd="command grc -es --colour=auto $cmd" + done } if [[ -x "$(whence grc)" ]]; then colorize