Commits

Toon Willems  committed 9a71c14

use powerline, just a timely commit

  • Participants
  • Parent commits 87f9039

Comments (0)

Files changed (1)

-" normal Bundles {{{
+" Bundles {{{
 set nocompatible
 filetype off
 set rtp+=~/.vim/bundle/vundle/
 
 Bundle 'Align'
 
-Bundle 'majutsushi/tagbar'
 
 Bundle 'mileszs/ack.vim'
 
 Bundle 'scrooloose/nerdtree'
-Bundle 'nudded/nerdcommenter'
+Bundle 'scrooloose/nerdcommenter'
 Bundle 'altercation/vim-colors-solarized'
+Bundle 'Lokaltog/vim-powerline'
+Bundle 'davidoc/taskpaper.vim'
+Bundle 'scrooloose/syntastic'
 filetype plugin indent on
 " }}}
 " Leader {{{
 
 " }}}
 " Colorscheme {{{
-set background=light
+set background=dark
 colorscheme solarized
 function! ToggleBG()
   if &background == 'light'
 let g:CommandTMatchWindowAtTop=0
 let g:CommandTMaxHeight=10
 
-" tagbar shortcut
-map <C-T> :TagbarToggle<CR>
-map <leader><leader> :NERDTreeToggle<CR>
+nnoremap <leader><leader> :NERDTreeToggle<esc>
 
 " NERDTree options
 nnoremap <D-/> <plug>NERDCommenterToggle<CR>
 vnoremap <D-/> <plug>NERDCommenterToggle<CR>
 let g:NERDCompactSexyComs=1
+
 " }}}
 " General options {{{
 set number
 set undoreload=10000
 set splitright
 set splitbelow
+set autoread " auto reload file on change
+
+set scrolloff=8 "keep 8 lines below/above cursor
 " }}}
 " Wrapping {{{
 set nowrap
 endfunction
 
 " }}}
-" Spellchecking {{{
-set spelllang=en,nl
-function! s:enableSpellCheck()
-  setlocal spell
-endfunction
-" }}}
 " Searching and movement {{{
 " Use sane regexes.
 nnoremap / /\v
 set backupskip=/tmp/*,/private/tmp/*"
 " }}}
 " Status line {{{
-
-augroup ft_statuslinecolor
-    au!
-
-    au InsertEnter * hi StatusLine ctermfg=196 guifg=#FF3145
-    au InsertLeave * hi StatusLine ctermfg=130 guifg=#CD5907
-augroup END
-
-set statusline=%f    " Path.
-set statusline+=\ %m   " Modified flag.
-set statusline+=%r   " Readonly flag.
-set statusline+=%w   " Preview window flag.
-
-set statusline+=\    " Space.
-
-" Line and column position and counts.
-set statusline+=(line\ %l\/%L,\ col\ %03c)
-
-set statusline+=%=   " Right align.
-
-" File format, encoding and type.  Ex: "(unix/utf-8/python)"
-set statusline+=[
-set statusline+=%{&ff}                        " Format (unix/DOS).
-set statusline+=:
-set statusline+=%{strlen(&fenc)?&fenc:&enc}   " Encoding (utf-8).
-set statusline+=:
-set statusline+=%{&ft}                        " Type (python).
-set statusline+=]
-
-
+" Replaced with powerline plugin
 " }}}
 " Folding {{{
 set foldlevelstart=0
 " Markdown {{{
 
 augroup ft_markdown
-    au!
+  au!
 
-    au BufNewFile,BufRead *.m*down setlocal filetype=markdown
-    au BufNewFile,BufRead *.md setlocal filetype=markdown
-    au Filetype markdown call s:setupWrapping()
-    au Filetype markdown call s:enableSpellCheck()
+  au BufNewFile,BufRead *.m*down setlocal filetype=markdown
+  au BufNewFile,BufRead *.md setlocal filetype=markdown
+  au Filetype markdown call s:setupWrapping()
 
-    " Use <localleader>1/2/3 to add headings.
-    au Filetype markdown nnoremap <buffer> <localleader>1 yypVr=
-    au Filetype markdown nnoremap <buffer> <localleader>2 yypVr-
-    au Filetype markdown nnoremap <buffer> <localleader>3 I### <ESC>
+  " Use <localleader>1/2/3 to add headings.
+  au Filetype markdown nnoremap <buffer> <localleader>1 yypVr=
+  au Filetype markdown nnoremap <buffer> <localleader>2 yypVr-
+  au Filetype markdown nnoremap <buffer> <localleader>3 I### <ESC>
 augroup END
 " }}}
 " C# {{{
   au Filetype c setlocal ts=4 sw=4 sts=4
 augroup END
 " }}}
+" Haskell {{{
+augroup haskell
+  au!
+  au Filetype haskell setlocal ts=4 sw=4 sts=4
+augroup END
+" }}}
+" Java {{{
+augroup java
+  au!
+  au Filetype java setlocal ts=4 sw=4 sts=4
+
+augroup END
+" }}}
+" }}}
+" TaskPaper {{{
+augroup taskpaper
+  au!
+  nnoremap <leader>ta :vsplit ~/.todo.taskpaper<CR>
+  autocmd BufRead,BufNewFile *.taskpaper  set ft=taskpaper
+  autocmd Filetype taskpaper  set noautoindent nosmartindent
+augroup END
 " }}}
 " Mappings {{{
 nnoremap <silent> <C-l> :noh<CR><C-L>