From 833aadcb27c796a52f40ff3abd0850ed13f6e1f8 Mon Sep 17 00:00:00 2001 From: Eumir Gaspar Date: Tue, 21 Aug 2012 16:25:37 +0800 Subject: [PATCH 1/4] Uses vim/after directory instead of root for custom vimrc.after --- vim/after/plugin/vimrc_after.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/after/plugin/vimrc_after.vim b/vim/after/plugin/vimrc_after.vim index 615d6e6..e287475 100644 --- a/vim/after/plugin/vimrc_after.vim +++ b/vim/after/plugin/vimrc_after.vim @@ -4,7 +4,7 @@ " This loads after the janus plugins so that janus-specific plugin mappings can " be overwritten. -if filereadable(expand("~/.vimrc.after")) - source ~/.vimrc.after +if filereadable(expand("~/.yadr/vim/after/vimrc.after")) + source ~/.yadr/vim/after/vimrc.after endif From a0ffe72d3509574e1712c261a253c8c20c22f8e0 Mon Sep 17 00:00:00 2001 From: Eumir Gaspar Date: Wed, 22 Aug 2012 07:56:19 +0800 Subject: [PATCH 2/4] Added original implementation for janus overrides --- vim/after/plugin/vimrc_after.vim | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vim/after/plugin/vimrc_after.vim b/vim/after/plugin/vimrc_after.vim index e287475..db83734 100644 --- a/vim/after/plugin/vimrc_after.vim +++ b/vim/after/plugin/vimrc_after.vim @@ -4,7 +4,10 @@ " This loads after the janus plugins so that janus-specific plugin mappings can " be overwritten. -if filereadable(expand("~/.yadr/vim/after/vimrc.after")) - source ~/.yadr/vim/after/vimrc.after +if filereadable(expand("~/.yadr/vim/after/.vimrc.after")) + source ~/.yadr/vim/after/.vimrc.after endif +if filereadable(expand("~/.vimrc.after")) + source ~/.vimrc.after +endif From a5efac5333590ef238a17fdcfe1ffd82e64682ee Mon Sep 17 00:00:00 2001 From: Eumir Gaspar Date: Wed, 22 Aug 2012 08:03:38 +0800 Subject: [PATCH 3/4] Updated README --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 66e2efa..5324881 100644 --- a/README.md +++ b/README.md @@ -502,7 +502,9 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke ### Overriding vim settings -You may use `~/.vimrc.before` for settings like the __leader__ setting. You may `~/.vimrc.after` for any additional overrides/settings. +You may use `~/.vimrc.before` for settings like the __leader__ setting. +You may `~/.vimrc.after` (for those transitioning from janus) or in `~/.yadr/vim/after/.vimrc.after` for any additional overrides/settings. +If you didn't have janus before, it is recommended to just put it in `~/.yadr/vim/after` so you can better manage your overrides. ### Adding your own vim plugins From 6f16123446a4e43d71a45f9ce054d28f6555ab03 Mon Sep 17 00:00:00 2001 From: Eumir Gaspar Date: Wed, 22 Aug 2012 08:03:51 +0800 Subject: [PATCH 4/4] Added vimrc.after to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 852fefc..48c159f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ vim/view *un~ vim/.netrwhist vim/tmp +vim/after/.vimrc.after .netrwhist bin/subl tags