From 9b9ab248573849480988bde4372ff068ade064fb Mon Sep 17 00:00:00 2001 From: Blubber Date: Tue, 20 Sep 2016 07:47:04 +0200 Subject: refactoring --- .vim/colors/buddy.vim | 2 +- .vim/install_vundle.sh | 3 +++ .vim/vimrc_files/colors.vim | 2 -- .vim/vimrc_files/highlights.vim | 6 +++++- .vim/vimrc_files/keymaps.vim | 44 ++++++-------------------------------- .vim/vimrc_files/plugin_config.vim | 29 +++++++++++-------------- .vim/vimrc_files/vundle.vim | 7 ++---- 7 files changed, 29 insertions(+), 64 deletions(-) (limited to '.vim') diff --git a/.vim/colors/buddy.vim b/.vim/colors/buddy.vim index dc55c97..42f1478 100755 --- a/.vim/colors/buddy.vim +++ b/.vim/colors/buddy.vim @@ -1,5 +1,5 @@ " Vim color file - buddy_modified -" Generated by http://bytefluent.com/vivify 2015-10-13 + set background=dark if version > 580 hi clear diff --git a/.vim/install_vundle.sh b/.vim/install_vundle.sh index b713214..f5caef2 100755 --- a/.vim/install_vundle.sh +++ b/.vim/install_vundle.sh @@ -11,3 +11,6 @@ fi if [ ! -d $INSTALL_DIR/Vundle.vim ]; then git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim fi + +# install plugins +vim +PluginInstall +qall diff --git a/.vim/vimrc_files/colors.vim b/.vim/vimrc_files/colors.vim index 20b9b31..3a68794 100644 --- a/.vim/vimrc_files/colors.vim +++ b/.vim/vimrc_files/colors.vim @@ -1,5 +1,3 @@ " dotfiles -- .vim/vimrc_files/colors.vim " author: johannst -hi x226_Yellow1 ctermfg=226 guifg=#ffff00 "rgb=255,255,0 -"hi x81_Light_Blue ctermfg=81 guifg=#ff0000 diff --git a/.vim/vimrc_files/highlights.vim b/.vim/vimrc_files/highlights.vim index 4a8c13d..61c349a 100644 --- a/.vim/vimrc_files/highlights.vim +++ b/.vim/vimrc_files/highlights.vim @@ -12,6 +12,10 @@ augroup CLNRSet autocmd! ColorScheme * hi CursorLineNR cterm=bold ctermfg=226 augroup END - +" Highlight status line hi StatusLine ctermbg=38 ctermfg=0 cterm=NONE term=NONE gui=NONE "hi StatusLineNC ctermbg=81 ctermfg=0 + +" matching brackets +"hi MatchParen cterm=underline ctermbg=141 ctermfg=yellow +hi MatchParen cterm=underline ctermbg=141 ctermfg=yellow diff --git a/.vim/vimrc_files/keymaps.vim b/.vim/vimrc_files/keymaps.vim index b38f5e9..f61663f 100644 --- a/.vim/vimrc_files/keymaps.vim +++ b/.vim/vimrc_files/keymaps.vim @@ -19,58 +19,22 @@ noremap q :q " re-adjust indentation map f mzgg=G`z -"let ArrowDisableMessage = "Arrow Keys disabled! Better learn hjkl ;)" - -" Disable arrow keys -- train jklh -" nnoremap :echo ArrowDisableMessage -" nnoremap :echo ArrowDisableMessage -" nnoremap :echo ArrowDisableMessage -" nnoremap :echo ArrowDisableMessage -" -" vnoremap :echo ArrowDisableMessage -" vnoremap :echo ArrowDisableMessage -" vnoremap :echo ArrowDisableMessage -" vnoremap :echo ArrowDisableMessage -" -" inoremap :echo ArrowDisableMessage -" inoremap :echo ArrowDisableMessage -" inoremap :echo ArrowDisableMessage -" inoremap :echo ArrowDisableMessage - - -" ctrl-hjkl move in insert mode -inoremap -inoremap -inoremap -inoremap - - -" ctrl-jk movement in command window -cnoremap -cnoremap -cnoremap -cnoremap - - " navigate between different splits map j map k map l map h - " resize splits map 5- map 5+ map 5< map 5> - " navigate between different buffers nnoremap :bprevious nnoremap :bnext - " ctrl-ae jump to line start/end nnoremap 0 nnoremap $ @@ -81,7 +45,6 @@ vnoremap $ cnoremap cnoremap - " Shortcut to toggle relative numbering mode nnoremap :call ToggleRelativeNumber() @@ -92,7 +55,12 @@ imap vnoremap VV''>o//}}}'<A " substitute selection -vnoremap "hy:%s/h//gc +vnoremap "hy:%s/h/h/gc + +" yank/paste into/from register +vnoremap "ay +inoremap a +cnoremap a " +-----------------+ " | Plugin specific | diff --git a/.vim/vimrc_files/plugin_config.vim b/.vim/vimrc_files/plugin_config.vim index d4c0848..c7b1a8f 100644 --- a/.vim/vimrc_files/plugin_config.vim +++ b/.vim/vimrc_files/plugin_config.vim @@ -1,7 +1,6 @@ " dotfiles -- .vim/vimrc_files/plugin_config.vim " author: johannst - " +----------------------------+ " | Vim-Airline | " +----------------------------+ @@ -10,20 +9,16 @@ let g:airline#extensions#tabline#enabled = 1 " Show just the filename let g:airline#extensions#tabline#fnamemod = ':t' - let g:airline_powerline_fonts = 1 if !exists('g:airline_symbols') let g:airline_symbols = {} endif - " +----------------------------+ " | Tagbar | " +----------------------------+ -let g:tagbar_ctags_bin='/u/jstolp/apps/bin/ctags' -"let g:tagbar_ctags_bin='/home/johannst/apps/bin/ctags' - +let g:tagbar_ctags_bin='~/.vim/bin/ctags' " +----------------------------+ " | OmniCppComplete | @@ -32,14 +27,14 @@ let g:tagbar_ctags_bin='/u/jstolp/apps/bin/ctags' " set tags+=~/.vim/tags/cpp_tags " OmniCppComplete -let OmniCpp_NamespaceSearch = 1 -let OmniCpp_GlobalScopeSearch = 1 -let OmniCpp_ShowAccess = 1 -let OmniCpp_ShowPrototypeInAbbr = 1 " show function parameters -let OmniCpp_MayCompleteDot = 1 " autocomplete after . -let OmniCpp_MayCompleteArrow = 1 " autocomplete after -> -let OmniCpp_MayCompleteScope = 1 " autocomplete after :: -let OmniCpp_DefaultNamespaces = ["std", "_GLIBCXX_STD"] -" automatically open and close the popup menu / preview window -au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif -set completeopt=menuone,menu,longest,preview +"let OmniCpp_NamespaceSearch = 1 +"let OmniCpp_GlobalScopeSearch = 1 +"let OmniCpp_ShowAccess = 1 +"let OmniCpp_ShowPrototypeInAbbr = 1 " show function parameters +"let OmniCpp_MayCompleteDot = 1 " autocomplete after . +"let OmniCpp_MayCompleteArrow = 1 " autocomplete after -> +"let OmniCpp_MayCompleteScope = 1 " autocomplete after :: +"let OmniCpp_DefaultNamespaces = ["std", "_GLIBCXX_STD"] +"" automatically open and close the popup menu / preview window +"au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif +"set completeopt=menuone,menu,longest,preview diff --git a/.vim/vimrc_files/vundle.vim b/.vim/vimrc_files/vundle.vim index c35d77d..eb568ef 100644 --- a/.vim/vimrc_files/vundle.vim +++ b/.vim/vimrc_files/vundle.vim @@ -10,8 +10,8 @@ set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() Plugin 'VundleVim/Vundle.vim' -Plugin 'jlanzarotta/bufexplorer' +Plugin 'jlanzarotta/bufexplorer' Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline-themes' @@ -19,9 +19,6 @@ Plugin 'vim-airline/vim-airline-themes' Plugin 'majutsushi/tagbar' " c++ modifief headers: http://www.vim.org/scripts/script.php?script_id=2358 -Plugin 'vim-scripts/OmniCppComplete' - -"Plugin 'vim-scripts/Conque-GDB' -Plugin 'tpope/vim-dispatch' +"Plugin 'vim-scripts/OmniCppComplete' call vundle#end() -- cgit v1.2.3