From 2f5d88cae4e898793db240fd80ecdd5450b141c6 Mon Sep 17 00:00:00 2001 From: ackman678 Date: Fri, 5 Apr 2019 16:31:56 -0700 Subject: [PATCH] vimrc base16-shell tmp fix see github/chriskempson/base16-shell issue 197 Feb 2019 --- .vimrc | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/.vimrc b/.vimrc index 5370e89..7184975 100644 --- a/.vimrc +++ b/.vimrc @@ -31,11 +31,19 @@ if empty(glob('~/.vim/autoload/plug.vim')) autocmd VimEnter * PlugInstall --sync | source $MYVIMRC endif +"tmp fix for chriskempson/base16-vim issue197 +" https://github.com/chriskempson/base16-vim/issues/197 +"can switch to danielwe/base16-vim below... +function FixupBase16(info) + !sed -i '/Base16hi/\! s/a:\(attr\|guisp\)/l:\1/g' ~/.vim/plugged/base16-vim/colors/*.vim +endfunction + call plug#begin('~/.vim/plugged') Plug '/usr/bin/fzf' Plug 'junegunn/fzf.vim' Plug 'tpope/vim-sensible' -Plug 'chriskempson/base16-vim' + +Plug 'chriskempson/base16-vim', { 'do': function('FixupBase16') } " Writing mode toggle `:Goyo` and `:Limelight` Plug 'junegunn/goyo.vim' @@ -201,11 +209,6 @@ set clipboard=unnamedplus let mapleader = ',' -if filereadable(expand("~/.vimrc_background")) - let base16colorspace=256 - source ~/.vimrc_background -endif - augroup resCur autocmd! autocmd BufReadPost * call setpos(".", getpos("'\"")) @@ -231,6 +234,14 @@ let g:NERDSpaceDelims = 1 "Use compact syntax for prettified multi-line comments let g:NERDCompactSexyComs = 1 +" set background=dark +if filereadable(expand("~/.vimrc_background")) + let base16colorspace=256 + source ~/.vimrc_background +endif + +colorscheme base16-gruvbox-dark-hard + "gvim options " if &t_Co > 2 || has("gui_running") if has("gui_running") @@ -244,7 +255,7 @@ if has("gui_running") ":set go+=m or go-=m to toggle menu colorscheme base16-ocean autocmd VimEnter * Goyo - autocmd VimEnter * Limelight0.8 + autocmd VimEnter * Limelight0.9 "Switch cursor blink rate to 0msec set guicursor+=a:blinkon0 endif