X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fvim%2F.vimrc;h=62ca06d8387969cdff3a60cde0c1f02765d2448f;hb=7475051f66d41ab4f726866bb33c89baa1ecb506;hp=5da54996af79d7730b9e6dfb1fec05781fb8b839;hpb=ba8d944658a4e8b99d9c5e4762da74ca5475d213;p=shutils.git

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 5da5499..62ca06d 100644
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -1,16 +1,13 @@
 " Purpose:      My personal .vimrc
 " Author:       Stefan Huber
-"
-"Essential resources for vim users
-"  - vim.sf.net -- find tips and scripts for vim and gvim
-"
-"By calling ":help keyword" you get help for the specific
-"option and setting.
+
+"profile start /tmp/profile.log
+"profile func *
+"profile file *
 
 
 set nocompatible
 set encoding=utf8
-set modeline
 set number
 set backspace=indent,eol,start
 
@@ -25,10 +22,12 @@ set cursorline
 set laststatus=2
 
 set listchars=tab:»­,trail:·,eol:$
+set virtualedit=block
 
 set autoindent
 set tabstop=4
 set shiftwidth=4
+set expandtab
 
 if version >= 703
     set spelllang=de_at,en
@@ -36,6 +35,10 @@ if version >= 703
     set colorcolumn=+1
 endif
 
+set wildmode=longest,list:longest
+
+set tags=./tags;/
+
 " Pathogen runtime path manipulation
 "call pathogen#infect() "Using the infect method breaks ft detection
 filetype off
@@ -53,7 +56,7 @@ set mouse=a
 
 " Use 256 colors
 set t_Co=256
-let g:CSApprox_attr_map = { 'bold' : 'bold', 'italic' : '', 'sp' : '' }
+let g:CSApprox_attr_map = { 'bold' : 'bold', 'italic' : 'underline', 'sp' : 'bg' }
 colorscheme shuber-wombat
 
 
@@ -61,8 +64,10 @@ colorscheme shuber-wombat
 highlight BadWhitespace ctermbg=red guibg=red
 " Make trailing whitespace be flagged as bad.
 au Filetype python,tex,c,cpp,cs,objc,java,vim syn match BadWhitespace /\s\+$/ containedin=ALL
+au Filetype python,tex,c,cpp,cs,objc,java,vim let g:airline#extensions#whitespace#enabled = 0
 
 
+" Detect indentation, but otherwise set expandtab
 if exists(":DetectIndent")
     au BufReadPost * :DetectIndent
 endif
@@ -71,6 +76,19 @@ endif
 let g:syntastic_mode_map = { 'mode' : 'active', 'active_filetypes' : [], 'passive_filetypes' : ['html'] }
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  Airline
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let g:airline_powerline_fonts = 0
+let g:airline_theme = 'wombat'
+
+let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tagbar#enabled = 0
+let g:airline#extensions#whitespace#enabled = 0
+let g:airline#extensions#branch#enabled = 0
+let g:airline#extensions#branch#use_vcscommand = 1
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  Some macros
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -85,7 +103,12 @@ endfunction
 "  key bindings
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
+nmap <s-PageDown> :bn<CR>
+nmap <s-PageUp>   :bp<CR>
+
 map <a-c> <plug>NERDCommenterToggle
+nmap <F9> :NERDTreeToggle<CR>
+nmap <F10> :TagbarToggle<CR>
 
 nmap <c-q> :q<CR>
 nmap <c-s> :w<CR>
@@ -113,7 +136,7 @@ au Filetype c,cpp,cs,objc,java map <S-F11> :A <CR>
 au Filetype c,cpp,cs,objc,java set cindent cst csto=0
 au Filetype c,cpp,cs,objc map <F7> :make <CR>
 au Filetype java map <F7> :!ant -f ../build.xml <CR>
-au Filetype c,cpp,cs,obj set makeprg=make
+au Filetype c,cpp,cs,objc set makeprg=make
 
 
 "Prepend the namespace to an identifier, e.g. 'std::' before 'map' excluding
@@ -180,7 +203,7 @@ function AddIncludeGuards()
 	call InsertIncludeGuardsWithoutEndif()
 endfunction
 
-autocmd BufNewFile *.{h,hpp} call AddIncludeGuards()
+autocmd BufNewFile *.{h,hpp,hxx} call AddIncludeGuards()
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -188,6 +211,7 @@ autocmd BufNewFile *.{h,hpp} call AddIncludeGuards()
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 au Filetype text set textwidth=80
+au Filetype markddown set textwidth=80
 "According to thunderbirds settings
 au Filetype mail set textwidth=72
 au Filetype mail set expandtab
@@ -216,12 +240,42 @@ au Filetype php set textwidth=80
 "au Filetype php set cindent
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  maxima
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+au BufRead,BufNewFile *.wxm set filetype=maxima
+
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  LaTeX
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
+
+let g:LatexBox_split_side = "rightbelow"
+"let g:LatexBox_split_resize = 1
+let g:LatexBox_ref_pattern = '\c\\\a*ref\*\?\_\s*{'
+
+let g:tex_flavor = "latex"
+let g:LatexBox_output_type = "pdf"
+let g:LatexBox_viewer = "okular"
+let g:LatexBox_latexmk_async = 1
+let g:LatexBox_latexmk_preview_continuously = 1
+"let g:LatexBox_show_warnings = 0
+let g:LatexBox_quickfix = 4
+
+
+if version >= 700
+    au Filetype tex set spell
+endif
+
 au BufRead,BufNewFile *.cls set filetype=tex
 au Filetype tex set textwidth=80
+au Filetype tex set smartindent
+" Override Tagbar Toggle with LatexBox TOC
+au Filetype tex nmap <F10> :LatexTOCToggle<CR>
+au Filetype tex nmap <F11> :LatexLabels<CR>
+
 
 "Remove Umlaute
 function TexTransUmlaute()
@@ -241,16 +295,6 @@ function FindWordRepeatings()
 "        call cursor(pos)
 endfunction
 
-let g:tex_flavor = "latex"
-let g:LatexBox_viewer="okular"
-let g:LatexBox_latexmk_options="-pvc"
-
-au Filetype tex set smartindent
-
-if version >= 700
-    au Filetype tex set spell
-endif
-
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  python
@@ -285,17 +329,46 @@ au Filetype xml map <M-o> :call OpenIn("ipe") <CR>
 au Filetype gnuplot map <M-o> :call OpenIn("gnuplot -persist") <CR>
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  remind
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+au BufRead,BufNewFile */.remind/* set filetype=remind
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  closetag
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let g:unaryTagsStack = ""
+au Filetype html,xml,xsl source /usr/share/vim/vimfiles/plugin/closetag.vim
+
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  youcompleteme
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-let g:ycm_min_num_of_chars_for_completion = 999
+let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
+
+let g:ycm_min_num_of_chars_for_completion = 4
+let g:ycm_collect_identifiers_from_tags_files = 1
+let g:ycm_autoclose_preview_window_after_completion = 1
+
 let g:ycm_key_list_select_completion = ['<Down>']
+nnoremap <leader>jd :YcmCompleter GoToDefinitionElseDeclaration<CR>
 
+let g:ycm_filetype_whitelist = { 'c' : 1, 'cpp' : 1, 'cs' : 1, 'objc' : 1, 'java' : 1, 'python' : 1 }
+
+"let g:ycm_server_use_vim_stdout = 1
+"let g:ycm_server_log_level = 'debug'
 
 
 if filereadable($HOME . "/.vimrc-local")
     source ~/.vimrc-local
 endif
 
+" Being able to load project specific vimrc files
+set exrc
+set secure
+