vimrc updated

.vimrc

@@ -4,12 +4,12 @@
 syntax on             " включить подсветку синтаксиса
 set ts=8              " у меня табуляция (tabstop) 4 символа
 set tabstop=8
-set shiftwidth=8
+set shiftwidth=2
 set textwidth=8
-set autoindent
 set tw=159
+set expandtab
+set autoindent
 set copyindent
-" set expandtab
 set background=dark   " весьма важная штука! :)
 set lbr
 set showcmd
@@ -19,6 +19,15 @@ color desert
 set number
 nmap <F6> :set invlist<cr>
 
+" Setup for the GNU coding format standard
+function! GnuIndent()
+    setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,h2,p5,t0,+2,(0,u0,w1,m1
+    setlocal shiftwidth=2
+    setlocal tabstop=8
+endfunction 
+
+au FileType c,cpp call GnuIndent()
+
 " отключение бэкапов
 set nobackup
 " set backup
@@ -62,12 +71,12 @@ imap <F10> <esc>:q!<cr>i
 :set tabpagemax=99
 nmap <C-a> :tabnew<cr>
 imap <C-a> <ESC>:tabnew<cr>
-map <C-k> :tabnext<cr>
-nmap <C-k> :tabnext<cr>
-imap <C-k> :tabnext<cr>
-map <C-j> :tabprev<cr>
-nmap <C-j> :tabprev<cr>
-imap <C-j> :tabprev<cr>
+map <C-x> :tabnext<cr>
+nmap <C-x> :tabnext<cr>
+imap <C-x> :tabnext<cr>
+map <C-z> :tabprev<cr>
+nmap <C-z> :tabprev<cr>
+imap <C-z> :tabprev<cr>
 
 " кириллица
 set encoding=utf-8
@@ -116,3 +125,76 @@ map <F4> [I:let nr = input("Which one: ")<Bar>exe "normal " . nr ."[\t"<CR>
 set foldenable
 set foldmethod=syntax
 
+" VUNDLE "
+set nocompatible               " be iMproved
+filetype off                   " required!
+
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
+" let Vundle manage Vundle
+" required! 
+Bundle 'gmarik/vundle'
+
+" My Bundles here:
+"
+" original repos on github
+Bundle 'tpope/vim-fugitive'
+Bundle 'Lokaltog/vim-easymotion'
+Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
+Bundle 'tpope/vim-rails.git'
+" vim-scripts repos
+Bundle 'L9'
+Bundle 'FuzzyFinder'
+" non github repos
+Bundle 'git://git.wincent.com/command-t.git'
+" ...
+
+filetype plugin indent on     " required!
+"
+" Brief help
+" :BundleList          - list configured bundles
+" :BundleInstall(!)    - install(update) bundles
+" :BundleSearch(!) foo - search(or refresh cache first) for foo
+" :BundleClean(!)      - confirm(or auto-approve) removal of unused bundles
+"
+" see :h vundle for more details or wiki for FAQ
+" NOTE: comments after Bundle command are not allowed..
+
+" clang_complete
+" let g:clang_complete_copen = 1
+" let g:clang_user_options='|| exit 0'
+filetype plugin on
+let g:clang_user_options='|| exit 0'
+let g:clang_complete_auto = 1
+let g:clang_complete_copen = 1
+
+" ------- Vala --------
+" Disable valadoc syntax highlight
+"let vala_ignore_valadoc = 1
+
+" Enable comment strings
+let vala_comment_strings = 1
+
+" Highlight space errors
+let vala_space_errors = 1
+" Disable trailing space errors
+"let vala_no_trail_space_error = 1
+" Disable space-tab-space errors
+let vala_no_tab_space_error = 1
+
+" Minimum lines used for comment syncing (default 50)
+"let vala_minlines = 120
+
+" ----- Vala taglist ------
+" Work-around Tag List for Vala
+let tlist_vala_settings='c#;d:macro;t:typedef;n:namespace;c:class;'.
+  \ 'E:event;g:enum;s:struct;i:interface;'.
+  \ 'p:properties;m:method'
+
+" ----- TagBar ------
+nmap <F9> :TagbarToggle<CR> 
+let g:tagbar_ctags_bin = "anjuta-tags"
+
+" ----- NERDTree ------
+nmap <F12> :NERDTreeToggle<CR>