X-Git-Url: https://git.sthu.org/?p=shutils.git;a=blobdiff_plain;f=dotfiles%2Fvim%2F.vimrc;h=1afa776496a204596986348607661b3d96ab2a07;hp=3858f3abe3be3df0f015db400e820a51d75a319a;hb=89b9f9a318f772b6ad4805a411abfadfcf426242;hpb=9fef42756f5fd61ea6b19d1c4cd628c8d9fa92ce

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index 3858f3a..1afa776 100644
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -20,6 +20,7 @@ set hlsearch
 
 set cursorline
 set laststatus=2
+set scrolloff=4
 
 set listchars=tab:»­,trail:·,eol:$
 set virtualedit=block
@@ -39,24 +40,23 @@ set wildmode=longest,list:longest
 
 set tags=./tags;/
 
+syntax on
+filetype plugin indent on
+
 " Pathogen runtime path manipulation
 "call pathogen#infect() "Using the infect method breaks ft detection
-filetype off
 call pathogen#runtime_append_all_bundles()
 call pathogen#helptags()
 
-syntax on
-filetype plugin indent on
-
 
 "Power saving tip: powertop-homepage
-let &guicursor = &guicursor . ",a:blinkon0"
+"let &guicursor = &guicursor . ",a:blinkon0"
 "According to vim help -- enable mouse in xterm...
 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
 
 
@@ -86,7 +86,7 @@ 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#enabled = 1
 let g:airline#extensions#branch#use_vcscommand = 1
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -103,14 +103,17 @@ 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>
-vmap <c-s> <Esc><c-s>gv
-imap <c-s> <c-o><c-s>
+"nmap <c-q> :q<CR>
+"nmap <c-s> :w<CR>
+"vmap <c-s> <Esc><c-s>gv
+"imap <c-s> <c-o><c-s>
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -126,14 +129,14 @@ au Filetype fortran     set cindent cst csto=0
 "  C, C++, C#, objc, java
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-au Filetype c,cpp,cs,objc,java map <F4> :cnext <CR>
-au Filetype c,cpp,cs,objc,java map <S-F4> :cprevious <CR>
-au Filetype c,cpp,cs,objc,java map <F11> :AS <CR>
-au Filetype c,cpp,cs,objc,java map <S-F11> :A <CR>
+au Filetype c,cpp,cs,objc,java map <buffer> <F4> :cnext <CR>
+au Filetype c,cpp,cs,objc,java map <buffer> <S-F4> :cprevious <CR>
+au Filetype c,cpp,cs,objc,java map <buffer> <F11> :AS <CR>
+au Filetype c,cpp,cs,objc,java map <buffer> <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 map <buffer> <F7> :make <CR>
+au Filetype java map <buffer> <F7> :!ant -f ../build.xml <CR>
+au Filetype c,cpp,cs,objc set makeprg=make
 
 
 "Prepend the namespace to an identifier, e.g. 'std::' before 'map' excluding
@@ -208,6 +211,7 @@ autocmd BufNewFile *.{h,hpp,hxx} 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
@@ -247,8 +251,31 @@ 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 <buffer> <F10> :LatexTOCToggle<CR>
+au Filetype tex nmap <buffer> <F11> :LatexLabels<CR>
+
 
 "Remove Umlaute
 function TexTransUmlaute()
@@ -268,26 +295,12 @@ function FindWordRepeatings()
 "        call cursor(pos)
 endfunction
 
-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 = 2
-
-au Filetype tex set smartindent
-
-if version >= 700
-    au Filetype tex set spell
-endif
-
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  python
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-au Filetype python map <F5> :!python % <CR>
+au Filetype python map <buffer> <F5> :!python % <CR>
 
 " vimrc file for following the coding standards specified in PEP 7 & 8.
 
@@ -305,15 +318,23 @@ au Filetype python set textwidth=79
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 "Opens the current file in ipe
-au Filetype xml map <M-o> :call OpenIn("ipe") <CR>
+au BufRead,BufNewFile *.ipe set filetype=ipe
+au Filetype xml,ipe map <buffer> <M-o> :call OpenIn("ipe") <CR>
 
+au Filetype xml let g:tagbar_sort = 0
+let g:tagbar_type_xml = {
+  \ 'ctagstype' : 'xml',
+  \ 'kinds' : [
+    \ 't:Tag'
+  \ ]
+\ }
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  gnuplot
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 "Opens the current file in ipe
-au Filetype gnuplot map <M-o> :call OpenIn("gnuplot -persist") <CR>
+au Filetype gnuplot map <buffer> <M-o> :call OpenIn("gnuplot -persist") <CR>
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -323,22 +344,88 @@ au Filetype gnuplot map <M-o> :call OpenIn("gnuplot -persist") <CR>
 au BufRead,BufNewFile */.remind/* set filetype=remind
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  vim-orgmode
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+au BufRead,BufNewFile *.org set filetype=org
+let g:org_todo_keywords=['TODO', 'FEEDBACK', 'VERIFY', '|', 'DONE', 'DELEGATED']
+let g:org_todo_keyword_faces = [['FEEDBACK', 'magenta'], ['TODO', 'yellow']]
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  markdown
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let g:instant_markdown_autostart = 0
+let g:instant_markdown_slow = 1
+au Filetype markdown map <buffer> <F5> :InstantMarkdownPreview<CR>
+au Filetype markdown let g:tagbar_sort = 0
+
+let g:tagbar_type_markdown = {
+  \ 'ctagstype' : 'markdown',
+  \ 'kinds' : [
+    \ 'h:Heading_L1',
+    \ 'i:Heading_L2',
+    \ 'k:Heading_L3'
+  \ ]
+\ }
+
+if executable('marktag')
+    let g:tagbar_type_markdown = {
+        \ 'ctagstype' : 'markdown',
+        \ 'ctagsbin' : 'marktag',
+        \ 'kinds' : [
+            \ 'h:header'
+        \ ],
+        \ 'sro' : '.',
+        \ 'kind2scope' : {
+            \ 'h' : 'header'
+        \  },
+        \ 'scope2kind' : {
+            \ 'header' : 'h'
+        \ }
+    \ }
+end
+
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "  youcompleteme
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-"let g:ycm_path_to_python_interpreter = '/usr/bin/python'
-let g:ycm_global_ycm_extra_conf = '/home/shuber/.ycm_extra_conf.py'
-let g:ycm_min_num_of_chars_for_completion = 999
-let g:ycm_key_list_select_completion = ['<Down>']
+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
-nnoremap <leader>jd :YcmCompleter GoToDefinitionElseDeclaration<CR>
+
+let g:ycm_key_list_select_completion = ['<Down>']
+nnoremap <buffer> <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'
 
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  syntastic
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let g:ycm_show_diagnostics_ui = 0
+let g:syntastic_c_checkers = ["cppcheck"]
+let g:syntastic_cpp_checkers = g:syntastic_c_checkers
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  signify
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let g:signify_vcs_list = ['git']
+
+
+
+
 if filereadable($HOME . "/.vimrc-local")
     source ~/.vimrc-local
 endif