summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.vim/bundles.vim12
-rw-r--r--.vimrc46
2 files changed, 42 insertions, 16 deletions
diff --git a/.vim/bundles.vim b/.vim/bundles.vim
index b74debf..5fac9a2 100644
--- a/.vim/bundles.vim
+++ b/.vim/bundles.vim
@@ -22,8 +22,8 @@ Bundle 'Gundo'
" NERDTree
Bundle 'The-NERD-tree'
-" Taglist
-Bundle 'taglist.vim'
+" Tagbar
+Bundle 'Tagbar'
" vim-latex
Bundle 'git://vim-latex.git.sourceforge.net/gitroot/vim-latex/vim-latex'
@@ -43,5 +43,13 @@ Bundle 'toggle_words.vim'
" syntaxes
Bundle 'lighttpd-syntax'
+" show TODO and XXX
+Bundle 'TaskList.vim'
+
+" syntactic checkers
+Bundle 'Syntastic'
+
+" projects
+Bundle 'project.tar.gz'
filetype plugin indent on " required!
diff --git a/.vimrc b/.vimrc
index 87e1edb..e93d6b0 100644
--- a/.vimrc
+++ b/.vimrc
@@ -18,6 +18,7 @@ set sts=4
set expandtab
set guifont=Inconsolata\ Medium\ 11,Monospace\ 11
set spelllang=de_20
+set guioptions-=T
if has("gui_running") " nice cursorline in the gui
set cursorline
@@ -31,7 +32,23 @@ let &guicursor = &guicursor . ",a:blinkon0"
" statusline
set laststatus=2 " always show line
-set statusline=%-3.3n\ %f\ %r%w[%{strlen(&ft)?&ft:'none'},%{strlen(&fenc)?&fenc:&enc.'\ (G)'},%{&fileformat}]%m%=%-14.(%l,%c%V%)%<%P
+
+fun StatusLine()
+ let ft = strlen(&ft)?&ft:"none"
+ let fenc = strlen(&fenc)?&fenc:&enc."\ (G)"
+ let head = fugitive#head(5)
+ if strlen(head)
+ let head = ",".head
+ endif
+
+ return '%-3.3n %f %r%w['
+ \ .ft.','.fenc
+ \ .',%{&fileformat}'
+ \ .head
+ \ .']%m%=%-14.(%l,%c%V%)%<%P'
+endfunction
+
+set statusline=%!StatusLine()
" Maximize window
function ToggleFullscreen()
@@ -65,23 +82,24 @@ cnoremap <Right> <Space><BS><Right>
" CUSTOM MAPPINGS
" =======================================================
-" Some maps
-nmap <Leader>t :ToggleWord<CR>
-map <C-F10> :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR>
-nmap <silent> <F12> :Tlist<CR>
-nmap <silent> <F11> :TlistUpdate<CR>
-nmap <silent> <F4> :ls<CR>:buf
-map <C-F12> :GundoToggle<CR>
+" Some maps opening/closing nice windows
+nmap <silent> <Leader>T :TagbarToggle<CR>
+nmap <silent> <Leader>U :GundoToggle<CR>
+nmap <silent> <Leader>L <Plug>TaskList
+nmap <silent> <Leader>P <Plug>ToggleProject
+
+" others
map <C-Tab> gt
map <C-S-Tab> gT
imap <S-Tab> <C-X><C-O>
-map <F10> :make<CR>
-
-map <C-M-f> :call ToggleFullscreen()<CR>
-imap <C-M-f> <ESC>:call ToggleFullscreen()<CR>a
+nmap <silent> <F4> :ls<CR>:buf
+nmap <Leader>t :ToggleWord<CR>
" Makes more sense and is similar to D
-map Y y$
+map Y y
+
+" emulate C-k as known from emacs/zsh/...
+imap <C-k> D
" =======================================================
" PLUGINS AND LANGUAGES
@@ -111,7 +129,7 @@ let g:autotagCtagsCmd="ctags --c++-kinds=+p --fields=+iaS --extra=+q"
" stuff for gentoo syntax
let g:bugsummary_browser="firefox %s"
-" for toggling in python
+" python syntax
let python_highlight_numbers = 1
let python_highlight_space_errors = 1