summaryrefslogtreecommitdiff
path: root/.vimrc
diff options
context:
space:
mode:
authorRené Neumann <rene.neumann@in.tum.de>2012-09-04 16:20:28 +0200
committerRené Neumann <rene.neumann@in.tum.de>2012-09-04 16:20:29 +0200
commit9d8238cef09d8cb7c270b616ec56a335e0ac0854 (patch)
treea7857c65ec06a48dd575d604539d331a90c01463 /.vimrc
parent08ae3f83268783edd51dd97a749c088007f7fea4 (diff)
downloaddotfiles-9d8238cef09d8cb7c270b616ec56a335e0ac0854.tar.gz
dotfiles-9d8238cef09d8cb7c270b616ec56a335e0ac0854.tar.bz2
dotfiles-9d8238cef09d8cb7c270b616ec56a335e0ac0854.zip
Move to bundles in vim -- also remove old craft
Diffstat (limited to '.vimrc')
-rw-r--r--.vimrc38
1 files changed, 2 insertions, 36 deletions
diff --git a/.vimrc b/.vimrc
index f7f6967..f784aff 100644
--- a/.vimrc
+++ b/.vimrc
@@ -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
" =======================================================