From eb4fdf7be09c246b3ff1068c5b0e900a8f32203e Mon Sep 17 00:00:00 2001 From: johannst Date: Sun, 2 Apr 2017 12:39:34 +0200 Subject: adapted vimrc + vimrc installer to link ctags; small changes in vim colorscheme --- install | 6 ++++-- vim/colors/johannst.vim | 24 ++++++++++++------------ vimrc | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/install b/install index a6f18c8..e9b9427 100755 --- a/install +++ b/install @@ -98,12 +98,14 @@ function vimConfigInstaller() { return 1 fi mkdir $vim_home > /dev/null 2>&1 - ln -s $ABS_BASE_DIR/vim/* $vim_home + ln -s $ABS_BASE_DIR/vim/* $vim_home > /dev/null 2>&1 echo -e "\n\" $gMagicNumber - Auto generated, do not delete or modify!" >> $vimrc echo -e "let \$MYVIMRC='$ABS_BASE_DIR/vimrc'" >> $vimrc echo -e "let \$VIMHOME='$vim_home'" >> $vimrc + # link ctags + type ctags >/dev/null 2>&1 && { echo -e "let \$MYCTAGS='$(which ctags)'" >> $vimrc; } echo -e "source $ABS_BASE_DIR/vimrc" >> $vimrc - git clone https://github.com/VundleVim/Vundle.vim.git $vim_home/bundle/Vundle.vim + git clone https://github.com/VundleVim/Vundle.vim.git $vim_home/bundle/Vundle.vim || { echo "Vundle not cloned, using existing!"; } vim +PluginInstall +qall return 0 } diff --git a/vim/colors/johannst.vim b/vim/colors/johannst.vim index c2a7e3c..4070881 100755 --- a/vim/colors/johannst.vim +++ b/vim/colors/johannst.vim @@ -13,17 +13,18 @@ hi clear "{{{ Vim Basic -hi Normal ctermfg=253 ctermbg=234 cterm=NONE -hi Search ctermfg=0 ctermbg=11 cterm=NONE -hi IncSearch ctermfg=0 ctermbg=11 cterm=NONE -hi Folded ctermfg=146 ctermbg=238 cterm=NONE -hi FoldColumn ctermfg=122 ctermbg=238 cterm=NONE -hi Title ctermfg=230 ctermbg=NONE cterm=bold -hi Todo ctermfg=232 ctermbg=222 cterm=NONE -hi NonText ctermfg=247 ctermbg=236 cterm=NONE -hi SpecialKey ctermfg=247 ctermbg=236 cterm=NONE -hi Visual ctermfg=230 ctermbg=238 cterm=NONE -hi VertSplit ctermfg=59 ctermbg=238 cterm=NONE +hi Normal ctermfg=253 ctermbg=234 cterm=NONE +hi Search ctermfg=0 ctermbg=11 cterm=NONE +hi IncSearch ctermfg=0 ctermbg=11 cterm=NONE +hi Folded ctermfg=146 ctermbg=238 cterm=NONE +hi FoldColumn ctermfg=122 ctermbg=238 cterm=NONE +hi Title ctermfg=230 ctermbg=NONE cterm=bold +hi Todo ctermfg=232 ctermbg=222 cterm=NONE +hi NonText ctermfg=247 ctermbg=236 cterm=NONE +hi SpecialKey ctermfg=247 ctermbg=236 cterm=NONE +hi Visual ctermfg=230 ctermbg=238 cterm=NONE +hi VertSplit ctermfg=59 ctermbg=238 cterm=NONE +hi Directory ctermfg=39 ctermbg=NONE cterm=NONE "}}} "{{{ Cursor & LineNumber @@ -134,7 +135,6 @@ hi Conditional ctermfg=11 ctermbg=NONE cterm=NONE "hi LocalVariable "hi SpellBad "hi CTagsClass -"hi Directory "hi Underlined "hi clear "hi SpecialComment diff --git a/vimrc b/vimrc index e00f191..433cc6a 100644 --- a/vimrc +++ b/vimrc @@ -65,7 +65,7 @@ if index(s:gEnabledPlugins, 'vim-airline/vim-airline')!=-1 endif if index(s:gEnabledPlugins, 'majutsushi/tagbar')!=-1 - let g:tagbar_ctags_bin=$VIMHOME . '/bin/ctags' + let g:tagbar_ctags_bin=$MYCTAGS if !empty(glob(g:tagbar_ctags_bin)) augroup aug:TagbarKeymaps autocmd! -- cgit v1.2.3