summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.vim/vimrc_files/keymaps.vim6
-rw-r--r--.vim/vimrc_files/vundle.vim6
-rw-r--r--.vimrc13
3 files changed, 19 insertions, 6 deletions
diff --git a/.vim/vimrc_files/keymaps.vim b/.vim/vimrc_files/keymaps.vim
index b440aed..b38f5e9 100644
--- a/.vim/vimrc_files/keymaps.vim
+++ b/.vim/vimrc_files/keymaps.vim
@@ -78,6 +78,8 @@ inoremap <C-a> <c-o>0
inoremap <C-e> <c-o>$
vnoremap <C-a> 0
vnoremap <C-e> $
+cnoremap <C-a> <Home>
+cnoremap <C-e> <End>
" Shortcut to toggle relative numbering mode
@@ -87,7 +89,7 @@ nnoremap <c-n> :call ToggleRelativeNumber()<CR>
nnoremap <C-f> o//{{{ <Esc>o//}}}<Esc><Up>A
imap <C-f> <ESC><C-f>
" only works with v-block (not v-line)
-vnoremap <C-f> VV'<O//{{{ <Esc>'>o//}}}<Esc>'<<ESC><Up>A
+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>
@@ -102,4 +104,4 @@ nnoremap <C-b> :call BufExplorer()<CR>
nnoremap <leader>t :TagbarToggle<CR>
" build tags of your own project with Ctrl-F12
-map <C-F12> :!ctags -R --sort=yes --c++-kinds=+pl --fields=+iaS --extra=+q --language-force=C++ .<CR>
+map <C-t> :!ctags -R --sort=yes --c++-kinds=+pl --fields=+iaS --extra=+q --language-force=C++ .<CR>
diff --git a/.vim/vimrc_files/vundle.vim b/.vim/vimrc_files/vundle.vim
index b540ef0..c35d77d 100644
--- a/.vim/vimrc_files/vundle.vim
+++ b/.vim/vimrc_files/vundle.vim
@@ -1,7 +1,8 @@
" dotfiles -- .vim/vimrc_files/vundle.vim
" author: johannst
-" to install plugins open vim and run :PluginInstall
+" to install plugins open vim and run :PluginInstall from within vim OR
+" vim +PluginInstall +qall from cmd line
filetype off " necessary for vundle!!!
set rtp+=~/.vim/bundle/Vundle.vim
@@ -20,4 +21,7 @@ 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'
+
call vundle#end()
diff --git a/.vimrc b/.vimrc
index 18c9d78..c1e6515 100644
--- a/.vimrc
+++ b/.vimrc
@@ -25,7 +25,8 @@ colorscheme buddy
" +----------------------------+
" | Basic Settings |
" +----------------------------+
-set timeoutlen=1234 " time in ms until command are interpreted
+set timeoutlen=1234 " time in ms until keymap interpreted
+set ttimeoutlen=1 " time in ms for key code delay, NEVER USE 0 again!!!
filetype plugin indent on " enable loading indent file for filetype
set ffs=unix,dos,mac " Try recognizing dos, unix, and mac line endings.
@@ -41,14 +42,14 @@ set mouse=a " Enable mouse usage (all modes)
set encoding=utf-8 " Set default encoding to UTF-8.
set history=1000 " Sets how many lines of history VIM has to remember
set tabpagemax=100 " Sets how many tabs will be opened
-set scrolloff=7 " set vertical scroll distance to 7 lines
+set scrolloff=2 " set vertical scroll distance to 7 lines
set tabstop=4 " set Tab-length
set expandtab " expand tabs to spaces
set shiftwidth=4 " but an indent level is 2 spaces wide.
set softtabstop=4 " <BS> over an autoindent deletes both spaces.
set shiftround " rounds indent to a multiple of shiftwidth
set backspace=2
-set formatoptions-=cro " disable auto-comment
+autocmd BufNewFile,BufRead * setlocal formatoptions=ql " disable auto-comment
set foldmethod=marker " set fold method
@@ -86,6 +87,12 @@ set wildignore+=*.o,*.obj,.git,*.pyc,*~
set noerrorbells
set novisualbell
+" automatically open Quickfix
+autocmd QuickFixCmdPost [^l]* nested cwindow
+autocmd QuickFixCmdPost l* nested lwindow
+nnoremap <leader>m :silent make!\|redraw!\|cc<CR>
+nnoremap <leader>g :silent grep! -R \|redraw!\|cc
+
" +----------------------------+
" | Source Extrenal Files |
" +----------------------------+