diff options
Diffstat (limited to '.vimrc')
| -rw-r--r-- | .vimrc | 38 |
1 files changed, 2 insertions, 36 deletions
@@ -2,17 +2,12 @@ " GENERAL " ======================================================= -" load the pathogen-style plugins -call pathogen#runtime_append_all_bundles() -call pathogen#helptags() +" load the bundles +source ~/.vim/bundles.vim " Colorscheme colorscheme desert -" Filetype -filetype indent on -filetype plugin on - " More general stuff set nu set fenc=utf-8 @@ -39,26 +34,6 @@ 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 " ======================================================= -" COMPLETION -" ======================================================= - -" Omnicomplete -autocmd FileType python set omnifunc=pythoncomplete#Complete -" nothing set for C/C++ -- done by the autoload feature -set completeopt=longest,menu,preview -set tags+=~/.vim/tags - -for tag in split(glob("~/.vim/tags.d/*"), "\n") - let &tags .= "," . tag -endfor - -" Allow Return to select a match -inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>" - -" pydiction -let g:pydiction_location = '~/.vim/pydiction/complete-dict' - -" ======================================================= " COMPLETION FOR CMDLINE " ======================================================= @@ -88,10 +63,6 @@ map <F10> :make<CR> " Makes more sense and is similar to D map Y y$ -" Haskell GHCi stuff -autocmd FileType haskell nmap <LocalLeader>gi :GHCi -autocmd FileType haskell nmap <LocalLeader>gr :GHCReload - " ======================================================= " PLUGINS AND LANGUAGES " ======================================================= @@ -121,11 +92,6 @@ let g:tex_flavor = "latex" " do not do concealment in .tex files -- just too slow (and ugly) let g:tex_conceal = "" -" haskell stuff -au BufEnter *.hs compiler ghc -let g:haddock_browser = "/home/necoro/bin/openlink" -let g:haddock_indexfiledir = "/home/necoro/.cache/vim/" - " ======================================================= " FINAL " ======================================================= |