aboutsummaryrefslogtreecommitdiff
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
parentaedb5373e47670db6f4433a14f834998084efe2c (diff)
downloaddotfiles-3e2740fe832372eecc2394057c7551b040c0ce65.tar.gz
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.
-rw-r--r--.gitmodules3
-rw-r--r--Makefile12
-rw-r--r--README.md4
-rw-r--r--man/man7/dotfiles.7df4
-rw-r--r--vim/config/syntax.vim5
-rw-r--r--vim/vimrc22
6 files changed, 15 insertions, 35 deletions
diff --git a/.gitmodules b/.gitmodules
index 8039bba..3315474 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
[submodule "vim/bundle/lion"]
path = vim/bundle/lion
url = https://sanctum.geek.nz/clone/vim-lion.git
-[submodule "vim/bundle/pathogen"]
- path = vim/bundle/pathogen
- url = https://sanctum.geek.nz/clone/vim-pathogen.git
[submodule "vim/bundle/repeat"]
path = vim/bundle/repeat
url = https://sanctum.geek.nz/clone/vim-repeat.git
diff --git a/Makefile b/Makefile
index dcb3b95..c4afdac 100644
--- a/Makefile
+++ b/Makefile
@@ -497,7 +497,6 @@ install-urxvt: urxvt/ext/select
-exec cp -p -- {} $(HOME)/.urxvt/ext \;
install-vim: install-vim-after \
- install-vim-autoload \
install-vim-bundle \
install-vim-compiler \
install-vim-config \
@@ -525,14 +524,13 @@ install-vim-after-syntax:
mkdir -p $(HOME)/.vim/after/syntax
cp -p -- vim/after/syntax/*.vim $(HOME)/.vim/after/syntax
-install-vim-autoload:
- mkdir -p -- $(HOME)/.vim/autoload
- cp -p -- vim/autoload/*.vim $(HOME)/.vim/autoload
-
install-vim-bundle: install-vim-config
find vim/bundle -name .git -prune -o \
- -type d -exec sh -c 'mkdir -p -- $(HOME)/."$$1"' _ {} \; -o \
- -type f -exec sh -c 'cp -p -- "$$1" $(HOME)/."$$1"' _ {} \;
+ -type d -exec sh -c \
+ 'mkdir -p -- $(HOME)/.vim/"$${1#vim/bundle/*/}"' _ {} \; \
+ -o \
+ -type f -exec sh -c \
+ 'cp -p -- "$$1" $(HOME)/.vim/"$${1#vim/bundle/*/}"' _ {} \;
install-vim-compiler:
mkdir -p -- $(HOME)/.vim/compiler
diff --git a/README.md b/README.md
index e8b6735..5109afd 100644
--- a/README.md
+++ b/README.md
@@ -361,8 +361,8 @@ and tidying, and a few more in `~/.vim/after/indent`. There are also a few
tweaks to core syntax files in `~/.vim/after/syntax`, especially for shell
script (`sh.vim`).
-Third-party plugins are in submodules in `~/.vim/bundle`, loaded using Tim
-Pope's [pathogen.vim](https://github.com/tpope/vim-pathogen).
+Third-party plugins are in submodules in `~/.vim/bundle`. They are installed
+into `~/.vim` as normal.
Scripts
-------
diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df
index b00f9a8..dffde94 100644
--- a/man/man7/dotfiles.7df
+++ b/man/man7/dotfiles.7df
@@ -500,8 +500,8 @@ There are also a few tweaks to core syntax files in
\f[C]~/.vim/after/syntax\f[], especially for shell script
(\f[C]sh.vim\f[]).
.PP
-Third\-party plugins are in submodules in \f[C]~/.vim/bundle\f[], loaded
-using Tim Pope's pathogen.vim (https://github.com/tpope/vim-pathogen).
+Third\-party plugins are in submodules in \f[C]~/.vim/bundle\f[].
+They are installed into \f[C]~/.vim\f[] as normal.
.SS Scripts
.PP
Where practical, I make short scripts into POSIX (but not Bourne)
diff --git a/vim/config/syntax.vim b/vim/config/syntax.vim
index 00004e3..2322db5 100644
--- a/vim/config/syntax.vim
+++ b/vim/config/syntax.vim
@@ -14,4 +14,9 @@ if has('syntax') && !has('g:syntax_on')
set background=dark
endif
+ " The 'sahara' colorscheme only works for dark backgrounds with 256 colors
+ if &background ==# 'dark' && (has('gui_running') || &t_Co == 256)
+ silent! colorscheme sahara
+ endif
+
endif
diff --git a/vim/vimrc b/vim/vimrc
index 1836395..87f863a 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')