refactoring

5 files changed, 25 insertions, 63 deletions

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 <leader>q :q<CR>
 " re-adjust indentation
 map <leader>f mzgg=G`z
 
-"let ArrowDisableMessage = "Arrow Keys disabled! Better learn hjkl ;)"
-
-" Disable arrow keys -- train jklh
-" nnoremap <Left>  :echo ArrowDisableMessage<CR>
-" nnoremap <Right> :echo ArrowDisableMessage<CR>
-" nnoremap <Up>    :echo ArrowDisableMessage<CR>
-" nnoremap <Down>  :echo ArrowDisableMessage<CR>
-" 
-" vnoremap <Left>  :<c-u>echo ArrowDisableMessage<CR>
-" vnoremap <Right> :<c-u>echo ArrowDisableMessage<CR>
-" vnoremap <Up>    :<c-u>echo ArrowDisableMessage<CR>
-" vnoremap <Down>  :<c-u>echo ArrowDisableMessage<CR>
-" 
-" inoremap <Left>  <c-o>:echo ArrowDisableMessage<CR>
-" inoremap <Right> <c-o>:echo ArrowDisableMessage<CR>
-" inoremap <Up>    <c-o>:echo ArrowDisableMessage<CR>
-" inoremap <Down>  <c-o>:echo ArrowDisableMessage<CR>
-
-
-" ctrl-hjkl move in insert mode
-inoremap <c-h> <Left>
-inoremap <c-j> <Down>
-inoremap <c-k> <Up>
-inoremap <c-l> <Right>
-
-
-" ctrl-jk movement in command window
-cnoremap <c-h> <Left>
-cnoremap <c-j> <Down>
-cnoremap <c-k> <Up>
-cnoremap <c-l> <Right>
-
-
 " navigate between different splits 
 map <C-Down>  <c-w>j
 map <C-Up>    <c-w>k
 map <C-Right> <c-w>l
 map <C-Left>  <c-w>h
 
-
 " resize splits
 map <C-j>     <C-w>5-
 map <C-k>     <C-w>5+
 map <C-l>     <C-w>5<
 map <C-h>     <C-w>5>
 
-   
 " navigate between different buffers 
 nnoremap <S-Left>  :bprevious<CR>
 nnoremap <S-Right> :bnext<CR>
 
-
 " ctrl-ae jump to line start/end 
 nnoremap <C-a> 0
 nnoremap <C-e> $
@@ -81,7 +45,6 @@ vnoremap <C-e> $
 cnoremap <C-a> <Home>
 cnoremap <C-e> <End>
 
-
 " Shortcut to toggle relative numbering mode
 nnoremap <c-n> :call ToggleRelativeNumber()<CR>
 
@@ -92,7 +55,12 @@ imap <C-f> <ESC><C-f>
 vnoremap <C-f> VV'<O//{{{<Esc>'>o//}}}<Esc>'<<ESC><Up>A 
 
 " substitute selection
-vnoremap <C-r> "hy:%s/<C-r>h//gc<left><left><left>
+vnoremap <C-r> "hy:%s/<C-r>h/<C-r>h/gc<left><left><left>
+
+" yank/paste into/from register
+vnoremap <C-c> "ay
+inoremap <C-v> <C-r>a
+cnoremap <C-v> <C-r>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()