aboutsummaryrefslogtreecommitdiff
path: root/vim/vimrc
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-01-23 14:58:52 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-01-23 14:58:52 +1300
commit3e2740fe832372eecc2394057c7551b040c0ce65 (patch)
treeec9bad735ec5e5d73e69fc9223135f3eb8ece3a5 /vim/vimrc
parentMerge branch 'release/v0.25.0' into develop (diff)
downloaddotfiles-3e2740fe832372eecc2394057c7551b040c0ce65.tar.gz
dotfiles-3e2740fe832372eecc2394057c7551b040c0ce65.zip
Remove Pathogen from Vim setup
Given that all of this is installed rather than symbolically linked, there's not really any harm following the old mixed ~/.vim layout for plugins. It's one less dependency and it makes the setup quite a bit less complicated.
Diffstat (limited to 'vim/vimrc')
-rw-r--r--vim/vimrc22
1 files changed, 1 insertions, 21 deletions
diff --git a/vim/vimrc b/vim/vimrc
index 18363956..87f863a6 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -12,29 +12,9 @@ if has('eval')
let g:maplocalleader = '_'
endif
-" Load configuration files from ~/.vim/config or its analogue, before Pathogen
-" loads all its directories into 'runtimepath'
+" Source all .vim files from ~/.vim/config
runtime! config/*.vim
-" If our version isn't ancient and Pathogen is available, call it to load all
-" the plugins in .vim/bundle; these are saved as submodules
-if v:version >= 701
-
- " Bootstrap Pathogen
- runtime bundle/pathogen/autoload/pathogen.vim
-
- " Run Pathogen to broaden 'realtimepath' for plugin code and help tags
- silent! call pathogen#infect()
- silent! call pathogen#helptags()
-
- " The 'sahara' colorscheme only works for dark backgrounds with 256 colors
- if has('syntax')
- \ && &background ==# 'dark'
- \ && (has('gui_running') || &t_Co == 256)
- silent! colorscheme sahara
- endif
-endif
-
" If we're in compatible mode, put 'cpoptions' back the way we found it at the
" start of this configuration, even though it's the current year
if exists('s:cpoptions_save')