removed ./colors dir because they are installed as addons

[stack/conf/vim.git] / vimrc

diff --git a/vimrc b/vimrc
index 3cc81e8..bcba4cf 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -37,7 +37,7 @@ set ruler " Always show current positions along the bottom
 set number " turn on line numbers
 set lz " do not redraw while running macros (much faster) (LazyRedraw)
 set hid " you can change buffer without saving
 set number " turn on line numbers
 set lz " do not redraw while running macros (much faster) (LazyRedraw)
 set hid " you can change buffer without saving

-set backspace=2 " make backspace work normal    
+set backspace=eol,start,indent " make backspace work normal    

 set whichwrap+=<,>,h,l  " backspace and cursor keys wrap to
 set shortmess=atI " shortens messages to avoid 'press a key' prompt 
 set report=0 " tell us when anything is changed via :...
 set whichwrap+=<,>,h,l  " backspace and cursor keys wrap to
 set shortmess=atI " shortens messages to avoid 'press a key' prompt 
 set report=0 " tell us when anything is changed via :...


@@ -62,6 +62,7 @@ set laststatus=2 " always show the status line
 " Text Formatting/Layout
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 set fo=tcrqn " See Help (complex)
 " Text Formatting/Layout
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 set fo=tcrqn " See Help (complex)

+set ai " autoindent

 set si " smartindent 
 set tabstop=4 " tab spacing (settings below are just to unify it)
 set softtabstop=4 " unify
 set si " smartindent 
 set tabstop=4 " tab spacing (settings below are just to unify it)
 set softtabstop=4 " unify


@@ -164,6 +165,9 @@ imap <F2> <Esc>:NERDTreeToggle<CR>
 map <F3> :TagbarToggle<CR>
 imap <F3> <Esc>:TagbarToggle<CR>
 
 map <F3> :TagbarToggle<CR>
 imap <F3> <Esc>:TagbarToggle<CR>
 

+" Alt-right/left to navigate forward/backward in the tags stack
+map <M-Left> <C-T>
+map <M-Right> <C-]>

 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Autocommands
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Autocommands


@@ -205,11 +209,6 @@ if has ("autocmd")
 endif
  
 
 endif
  
 

-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Useful abbrevs
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-iab xdate <c-r>=strftime("%d/%m/%y %H:%M:%S")<cr> 
-

 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " General configs
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " General configs
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""


@@ -233,9 +232,9 @@ let vam_install_path = expand('$HOME') . '/.vim/addons'
 exec 'set runtimepath+='.vam_install_path.'/vim-addon-manager'
 " Enable addons with vim-addon-manager using file type recognition
 let ft_addons = {
 exec 'set runtimepath+='.vam_install_path.'/vim-addon-manager'
 " Enable addons with vim-addon-manager using file type recognition
 let ft_addons = {

-    \ 'always': ['surround', 'checksyntax', 'LargeFile', 'snipmate', 'snipmate-snippets', 'The_NERD_tree', 'SuperTab%1643'],
+    \ 'always': ['surround', 'checksyntax', 'quickfixsigns', 'LargeFile', 'snipmate', 'snipmate-snippets', 'The_NERD_tree', 'SuperTab%1643'],

     \ 'r': [ 'Screen_vim__gnu_screentmux', 'Vim-R-plugin' ],
     \ 'r': [ 'Screen_vim__gnu_screentmux', 'Vim-R-plugin' ],

-    \ '^\%(c\|cpp\|javascript\|python\|php\|html\|xml\|r\|sh\|css\|java\|make\|xslt\|vim\)$': [ 'Tagbar', 'checksyntax'],
+    \ '^\%(c\|cpp\|javascript\|python\|php\|html\|xml\|r\|sh\|css\|java\|make\|xslt\|vim\)$': [ 'Tagbar', 'checksyntax', 'TagHighlight'],

     \ '^\%(c\|cpp\)$': [ 'clang_complete' ],
     \ 'python': ['pythoncomplete', 'python_pydoc'],
     \ 'php': ['phpcomplete', 'PDV_-_phpDocumentor_for_Vim'],
     \ '^\%(c\|cpp\)$': [ 'clang_complete' ],
     \ 'python': ['pythoncomplete', 'python_pydoc'],
     \ 'php': ['phpcomplete', 'PDV_-_phpDocumentor_for_Vim'],


@@ -246,6 +245,13 @@ au FileType * for l in values(filter(copy(ft_addons), string(expand('<amatch>'))
 
 " SuperTab option for context aware completion
 let g:SuperTabDefaultCompletionType = "context"
 
 " SuperTab option for context aware completion
 let g:SuperTabDefaultCompletionType = "context"

+" If you prefer the Omni-Completion tip window to close when a selection is
+" " made, these lines close it on movement in insert mode or when leaving
+" " insert mode
+if has("autocmd")
+    autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
+    autocmd InsertLeave * if pumvisible() == 0|pclose|endif
+endif

 
 let g:clang_complete_copen = 1
 let g:clang_complete_auto = 1
 
 let g:clang_complete_copen = 1
 let g:clang_complete_auto = 1