vim: update

diff --git a/dotfiles/vim/.gvimrc b/dotfiles/vim/.gvimrc
index a7080f8d1774a3c9af334a38235f039547af5779..a595464deec3f8c6341533b1c6c59d59ae786a88 100644 (file)
--- a/dotfiles/vim/.gvimrc
+++ b/dotfiles/vim/.gvimrc
@@ -18,7 +18,7 @@ function SetPresentationFont(mode)
        if a:mode
                set guifont=Liberation\ Mono\ for\ Powerline\ 12,Monospace\ Bold\ 12
        else
-               set guifont=Liberation\ Mono\ for\ Powerline\ 10,Monospace\ 10
+               set guifont=Liberation\ Mono\ for\ Powerline\ 10,Monospace\ 8
        endif
 endfunction
 

diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc
index b657226df4f51211ed470a693f9c1c296de4fa50..04ed529a0980814f228ef213cf97e93928e82586 100644 (file)
--- a/dotfiles/vim/.vimrc
+++ b/dotfiles/vim/.vimrc
@@ -39,15 +39,14 @@ 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"
@@ -86,7 +85,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
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -318,8 +317,16 @@ au Filetype python set textwidth=79
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 "Opens the current file in ipe
-au Filetype xml map <buffer> <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
@@ -337,11 +344,12 @@ au BufRead,BufNewFile */.remind/* set filetype=remind
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"  closetag
+"  vim-orgmode
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-let g:unaryTagsStack = ""
-au Filetype html,xml,xsl source /usr/share/vim/vimfiles/plugin/closetag.vim
+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']]
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -351,6 +359,33 @@ au Filetype html,xml,xsl source /usr/share/vim/vimfiles/plugin/closetag.vim
 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
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""