From 46946c9b8bb64cfec4997dbba8d8eea9ab5d9937 Mon Sep 17 00:00:00 2001 From: Yan Pritzker Date: Mon, 21 Oct 2013 16:10:40 -0500 Subject: [PATCH] Move vim settings out of plugins to ensure they all get correctly loaded after everything else [Fix #373] --- README.md | 10 +++++----- vim/settings.vim | 4 ++++ vim/{plugin => }/settings/NERDtree-tabs.vim | 0 vim/{plugin => }/settings/NERDtree.vim | 0 vim/{plugin => }/settings/README.md | 0 vim/{plugin => }/settings/abbr.vim | 0 vim/{plugin => }/settings/airline.vim | 0 vim/{plugin => }/settings/autotag.vim | 0 vim/{plugin => }/settings/camelcasemotion.vim | 0 vim/{plugin => }/settings/conqueterm.vim | 0 vim/{plugin => }/settings/ctrlp.vim | 0 vim/{plugin => }/settings/easymotion.vim | 0 vim/{plugin => }/settings/fugitive.vim | 0 vim/{plugin => }/settings/gh-markdown.vim | 0 vim/{plugin => }/settings/git-grep.vim | 0 vim/{plugin => }/settings/gotofile.vim | 0 vim/{plugin => }/settings/grep.vim | 0 vim/{plugin => }/settings/gundo.vim | 0 vim/{plugin => }/settings/jquery.vim | 0 vim/{plugin => }/settings/lusty-juggler.vim | 0 vim/{plugin => }/settings/neocomplcache.vim | 0 vim/{plugin => }/settings/next-textobject.vim | 0 vim/{plugin => }/settings/open-changed-files.vim | 0 vim/{plugin => }/settings/outerblock.vim | 0 vim/{plugin => }/settings/persistent-undo.vim | 0 vim/{plugin => }/settings/powerline.vim | 0 vim/{plugin => }/settings/quickfix-search.vim | 0 vim/{plugin => }/settings/rails.vim | 0 vim/{plugin => }/settings/rspec.vim | 0 vim/{plugin => }/settings/showmarks.vim | 0 vim/{plugin => }/settings/smart_jump_to_tag.vim | 0 vim/{plugin => }/settings/solarized.vim | 5 ++--- .../settings/stop-visual-paste-insanity.vim | 0 vim/{plugin => }/settings/surround.vim | 0 vim/{plugin => }/settings/syntastic.vim | 0 vim/{plugin => }/settings/tComment.vim | 0 vim/{plugin => }/settings/tagbar.vim | 0 vim/{plugin => }/settings/tidy.vim | 0 vim/{plugin => }/settings/unimpaired.vim | 0 vim/{plugin => }/settings/vim-fugitive.vim | 0 vim/{plugin => }/settings/vim-indent-guides.vim | 0 vim/{plugin => }/settings/vim-multiple-cursors.vim | 0 vim/{plugin => }/settings/vim-ruby-conque.vim | 0 vim/{plugin => }/settings/vim-ruby-debugger.vim | 0 vim/{plugin => }/settings/yadr-appearance.vim | 0 vim/{plugin => }/settings/yadr-append-semicolon.vim | 0 vim/{plugin => }/settings/yadr-guioptions.vim | 0 vim/{plugin => }/settings/yadr-keymap.vim | 0 vim/{plugin => }/settings/yadr-search.vim | 0 vim/{plugin => }/settings/yadr-sudo-write.vim | 0 vim/{plugin => }/settings/yadr-whitespace-killer.vim | 0 vim/{plugin => }/settings/yadr-window-killer.vim | 0 vim/{plugin => }/settings/yadr-wrapping.vim | 0 vim/{plugin => }/settings/yankring.vim | 0 vimrc | 4 ++++ 55 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 vim/settings.vim rename vim/{plugin => }/settings/NERDtree-tabs.vim (100%) rename vim/{plugin => }/settings/NERDtree.vim (100%) rename vim/{plugin => }/settings/README.md (100%) rename vim/{plugin => }/settings/abbr.vim (100%) rename vim/{plugin => }/settings/airline.vim (100%) rename vim/{plugin => }/settings/autotag.vim (100%) rename vim/{plugin => }/settings/camelcasemotion.vim (100%) rename vim/{plugin => }/settings/conqueterm.vim (100%) rename vim/{plugin => }/settings/ctrlp.vim (100%) rename vim/{plugin => }/settings/easymotion.vim (100%) rename vim/{plugin => }/settings/fugitive.vim (100%) rename vim/{plugin => }/settings/gh-markdown.vim (100%) rename vim/{plugin => }/settings/git-grep.vim (100%) rename vim/{plugin => }/settings/gotofile.vim (100%) rename vim/{plugin => }/settings/grep.vim (100%) rename vim/{plugin => }/settings/gundo.vim (100%) rename vim/{plugin => }/settings/jquery.vim (100%) rename vim/{plugin => }/settings/lusty-juggler.vim (100%) rename vim/{plugin => }/settings/neocomplcache.vim (100%) rename vim/{plugin => }/settings/next-textobject.vim (100%) rename vim/{plugin => }/settings/open-changed-files.vim (100%) rename vim/{plugin => }/settings/outerblock.vim (100%) rename vim/{plugin => }/settings/persistent-undo.vim (100%) rename vim/{plugin => }/settings/powerline.vim (100%) rename vim/{plugin => }/settings/quickfix-search.vim (100%) rename vim/{plugin => }/settings/rails.vim (100%) rename vim/{plugin => }/settings/rspec.vim (100%) rename vim/{plugin => }/settings/showmarks.vim (100%) rename vim/{plugin => }/settings/smart_jump_to_tag.vim (100%) rename vim/{plugin => }/settings/solarized.vim (94%) rename vim/{plugin => }/settings/stop-visual-paste-insanity.vim (100%) rename vim/{plugin => }/settings/surround.vim (100%) rename vim/{plugin => }/settings/syntastic.vim (100%) rename vim/{plugin => }/settings/tComment.vim (100%) rename vim/{plugin => }/settings/tagbar.vim (100%) rename vim/{plugin => }/settings/tidy.vim (100%) rename vim/{plugin => }/settings/unimpaired.vim (100%) rename vim/{plugin => }/settings/vim-fugitive.vim (100%) rename vim/{plugin => }/settings/vim-indent-guides.vim (100%) rename vim/{plugin => }/settings/vim-multiple-cursors.vim (100%) rename vim/{plugin => }/settings/vim-ruby-conque.vim (100%) rename vim/{plugin => }/settings/vim-ruby-debugger.vim (100%) rename vim/{plugin => }/settings/yadr-appearance.vim (100%) rename vim/{plugin => }/settings/yadr-append-semicolon.vim (100%) rename vim/{plugin => }/settings/yadr-guioptions.vim (100%) rename vim/{plugin => }/settings/yadr-keymap.vim (100%) rename vim/{plugin => }/settings/yadr-search.vim (100%) rename vim/{plugin => }/settings/yadr-sudo-write.vim (100%) rename vim/{plugin => }/settings/yadr-whitespace-killer.vim (100%) rename vim/{plugin => }/settings/yadr-window-killer.vim (100%) rename vim/{plugin => }/settings/yadr-wrapping.vim (100%) rename vim/{plugin => }/settings/yankring.vim (100%) diff --git a/README.md b/README.md index 861d878..fa78a06 100644 --- a/README.md +++ b/README.md @@ -26,13 +26,13 @@ from scouring other people's dotfile repos, blogs, and projects. * Easy to use plugin architecture, no config files to edit. * Pick one tool and use it everywhere: vim-ize everything * Beautiful, easy to read and small vimrc** - * No key overrides or custom hackery in vimrc, everything in well factored snippets in .vim/plugin/settings** + * No key overrides or custom hackery in vimrc, everything in well factored snippets in .vim/settings** * Much larger list of vim plugins than Janus, specifically geared to Ruby/Rails/Git development. * Optimized support for Solarized color scheme only, everything guaranteed to Look Good. Your eyes will thank you. * All plugins tested with Solarized and custom color maps provided where needed to ensure your eyes will not bleed. * No configuration file to maintain. YADR uses tiny ruby scripts to wrap git submodule maintenance. * Much cleaner vimrc that keps keymaps isolated to a plugin file (not in the main vimrc). - * All keymaps and customization in small, easy to maintain files under .vim/plugin/settings + * All keymaps and customization in small, easy to maintain files under .vim/settings * More than just vim plugins - great shell aliases, osx, and irb/pry tweaks to make you more productive. ## Screenshot @@ -192,7 +192,7 @@ if you don't like them, or make your own. ### Vim Keymaps -The files in vim/plugin/settings are customizations stored on a per-plugin +The files in vim/settings are customizations stored on a per-plugin basis. The main keymap is available in skwp-keymap.vim, but some of the vim files contain key mappings as well (TODO: probably will move them out to skwp-keymap.vim) @@ -220,7 +220,7 @@ If you omit the key combo, you'll get a list of all the maps. You can do the sam #### Surround.vim customizations - * in plugin/settings/surround.vim (this folder contains all my customizations) + * in settings/surround.vim (this folder contains all my customizations) * the `#` key now surrounds with `#{}`, so `ysaw#` (surround around word) `#{foo}` * `=` surrounds with `<%= erb tag %>`; `-` for `<% this %>`. So, `yss=` or `yss-` to wrap code @@ -322,7 +322,7 @@ If you omit the key combo, you'll get a list of all the maps. You can do the sam #### Ruby Debugger - * Visual ruby debugger included. All keys remapped to `,d(something)` such as `,dn` for Debugger Next or `,dv` for Debugger Variables. Use `:help ruby-debugger` for more info, but keep in mind the new key maps (see vim/plugin/settings/vim-ruby-debugger.vim) + * Visual ruby debugger included. All keys remapped to `,d(something)` such as `,dn` for Debugger Next or `,dv` for Debugger Variables. Use `:help ruby-debugger` for more info, but keep in mind the new key maps (see vim/settings/vim-ruby-debugger.vim) #### Comments diff --git a/vim/settings.vim b/vim/settings.vim new file mode 100644 index 0000000..e2538db --- /dev/null +++ b/vim/settings.vim @@ -0,0 +1,4 @@ + +for fpath in split(globpath('~/.vim/settings', '*.vim'), '\n') + exe 'source' fpath +endfor diff --git a/vim/plugin/settings/NERDtree-tabs.vim b/vim/settings/NERDtree-tabs.vim similarity index 100% rename from vim/plugin/settings/NERDtree-tabs.vim rename to vim/settings/NERDtree-tabs.vim diff --git a/vim/plugin/settings/NERDtree.vim b/vim/settings/NERDtree.vim similarity index 100% rename from vim/plugin/settings/NERDtree.vim rename to vim/settings/NERDtree.vim diff --git a/vim/plugin/settings/README.md b/vim/settings/README.md similarity index 100% rename from vim/plugin/settings/README.md rename to vim/settings/README.md diff --git a/vim/plugin/settings/abbr.vim b/vim/settings/abbr.vim similarity index 100% rename from vim/plugin/settings/abbr.vim rename to vim/settings/abbr.vim diff --git a/vim/plugin/settings/airline.vim b/vim/settings/airline.vim similarity index 100% rename from vim/plugin/settings/airline.vim rename to vim/settings/airline.vim diff --git a/vim/plugin/settings/autotag.vim b/vim/settings/autotag.vim similarity index 100% rename from vim/plugin/settings/autotag.vim rename to vim/settings/autotag.vim diff --git a/vim/plugin/settings/camelcasemotion.vim b/vim/settings/camelcasemotion.vim similarity index 100% rename from vim/plugin/settings/camelcasemotion.vim rename to vim/settings/camelcasemotion.vim diff --git a/vim/plugin/settings/conqueterm.vim b/vim/settings/conqueterm.vim similarity index 100% rename from vim/plugin/settings/conqueterm.vim rename to vim/settings/conqueterm.vim diff --git a/vim/plugin/settings/ctrlp.vim b/vim/settings/ctrlp.vim similarity index 100% rename from vim/plugin/settings/ctrlp.vim rename to vim/settings/ctrlp.vim diff --git a/vim/plugin/settings/easymotion.vim b/vim/settings/easymotion.vim similarity index 100% rename from vim/plugin/settings/easymotion.vim rename to vim/settings/easymotion.vim diff --git a/vim/plugin/settings/fugitive.vim b/vim/settings/fugitive.vim similarity index 100% rename from vim/plugin/settings/fugitive.vim rename to vim/settings/fugitive.vim diff --git a/vim/plugin/settings/gh-markdown.vim b/vim/settings/gh-markdown.vim similarity index 100% rename from vim/plugin/settings/gh-markdown.vim rename to vim/settings/gh-markdown.vim diff --git a/vim/plugin/settings/git-grep.vim b/vim/settings/git-grep.vim similarity index 100% rename from vim/plugin/settings/git-grep.vim rename to vim/settings/git-grep.vim diff --git a/vim/plugin/settings/gotofile.vim b/vim/settings/gotofile.vim similarity index 100% rename from vim/plugin/settings/gotofile.vim rename to vim/settings/gotofile.vim diff --git a/vim/plugin/settings/grep.vim b/vim/settings/grep.vim similarity index 100% rename from vim/plugin/settings/grep.vim rename to vim/settings/grep.vim diff --git a/vim/plugin/settings/gundo.vim b/vim/settings/gundo.vim similarity index 100% rename from vim/plugin/settings/gundo.vim rename to vim/settings/gundo.vim diff --git a/vim/plugin/settings/jquery.vim b/vim/settings/jquery.vim similarity index 100% rename from vim/plugin/settings/jquery.vim rename to vim/settings/jquery.vim diff --git a/vim/plugin/settings/lusty-juggler.vim b/vim/settings/lusty-juggler.vim similarity index 100% rename from vim/plugin/settings/lusty-juggler.vim rename to vim/settings/lusty-juggler.vim diff --git a/vim/plugin/settings/neocomplcache.vim b/vim/settings/neocomplcache.vim similarity index 100% rename from vim/plugin/settings/neocomplcache.vim rename to vim/settings/neocomplcache.vim diff --git a/vim/plugin/settings/next-textobject.vim b/vim/settings/next-textobject.vim similarity index 100% rename from vim/plugin/settings/next-textobject.vim rename to vim/settings/next-textobject.vim diff --git a/vim/plugin/settings/open-changed-files.vim b/vim/settings/open-changed-files.vim similarity index 100% rename from vim/plugin/settings/open-changed-files.vim rename to vim/settings/open-changed-files.vim diff --git a/vim/plugin/settings/outerblock.vim b/vim/settings/outerblock.vim similarity index 100% rename from vim/plugin/settings/outerblock.vim rename to vim/settings/outerblock.vim diff --git a/vim/plugin/settings/persistent-undo.vim b/vim/settings/persistent-undo.vim similarity index 100% rename from vim/plugin/settings/persistent-undo.vim rename to vim/settings/persistent-undo.vim diff --git a/vim/plugin/settings/powerline.vim b/vim/settings/powerline.vim similarity index 100% rename from vim/plugin/settings/powerline.vim rename to vim/settings/powerline.vim diff --git a/vim/plugin/settings/quickfix-search.vim b/vim/settings/quickfix-search.vim similarity index 100% rename from vim/plugin/settings/quickfix-search.vim rename to vim/settings/quickfix-search.vim diff --git a/vim/plugin/settings/rails.vim b/vim/settings/rails.vim similarity index 100% rename from vim/plugin/settings/rails.vim rename to vim/settings/rails.vim diff --git a/vim/plugin/settings/rspec.vim b/vim/settings/rspec.vim similarity index 100% rename from vim/plugin/settings/rspec.vim rename to vim/settings/rspec.vim diff --git a/vim/plugin/settings/showmarks.vim b/vim/settings/showmarks.vim similarity index 100% rename from vim/plugin/settings/showmarks.vim rename to vim/settings/showmarks.vim diff --git a/vim/plugin/settings/smart_jump_to_tag.vim b/vim/settings/smart_jump_to_tag.vim similarity index 100% rename from vim/plugin/settings/smart_jump_to_tag.vim rename to vim/settings/smart_jump_to_tag.vim diff --git a/vim/plugin/settings/solarized.vim b/vim/settings/solarized.vim similarity index 94% rename from vim/plugin/settings/solarized.vim rename to vim/settings/solarized.vim index af0f9f5..179345c 100644 --- a/vim/plugin/settings/solarized.vim +++ b/vim/settings/solarized.vim @@ -64,6 +64,5 @@ hi! Visual ctermbg=233 hi! Type gui=bold hi! EasyMotionTarget guifg=#4CE660 gui=bold - -" Enforce the colors set here -au VimEnter * so ~/.vim/plugin/settings/solarized.vim +" Make sure this file loads itself on top of any other color settings +au VimEnter * so ~/.vim/settings/solarized.vim diff --git a/vim/plugin/settings/stop-visual-paste-insanity.vim b/vim/settings/stop-visual-paste-insanity.vim similarity index 100% rename from vim/plugin/settings/stop-visual-paste-insanity.vim rename to vim/settings/stop-visual-paste-insanity.vim diff --git a/vim/plugin/settings/surround.vim b/vim/settings/surround.vim similarity index 100% rename from vim/plugin/settings/surround.vim rename to vim/settings/surround.vim diff --git a/vim/plugin/settings/syntastic.vim b/vim/settings/syntastic.vim similarity index 100% rename from vim/plugin/settings/syntastic.vim rename to vim/settings/syntastic.vim diff --git a/vim/plugin/settings/tComment.vim b/vim/settings/tComment.vim similarity index 100% rename from vim/plugin/settings/tComment.vim rename to vim/settings/tComment.vim diff --git a/vim/plugin/settings/tagbar.vim b/vim/settings/tagbar.vim similarity index 100% rename from vim/plugin/settings/tagbar.vim rename to vim/settings/tagbar.vim diff --git a/vim/plugin/settings/tidy.vim b/vim/settings/tidy.vim similarity index 100% rename from vim/plugin/settings/tidy.vim rename to vim/settings/tidy.vim diff --git a/vim/plugin/settings/unimpaired.vim b/vim/settings/unimpaired.vim similarity index 100% rename from vim/plugin/settings/unimpaired.vim rename to vim/settings/unimpaired.vim diff --git a/vim/plugin/settings/vim-fugitive.vim b/vim/settings/vim-fugitive.vim similarity index 100% rename from vim/plugin/settings/vim-fugitive.vim rename to vim/settings/vim-fugitive.vim diff --git a/vim/plugin/settings/vim-indent-guides.vim b/vim/settings/vim-indent-guides.vim similarity index 100% rename from vim/plugin/settings/vim-indent-guides.vim rename to vim/settings/vim-indent-guides.vim diff --git a/vim/plugin/settings/vim-multiple-cursors.vim b/vim/settings/vim-multiple-cursors.vim similarity index 100% rename from vim/plugin/settings/vim-multiple-cursors.vim rename to vim/settings/vim-multiple-cursors.vim diff --git a/vim/plugin/settings/vim-ruby-conque.vim b/vim/settings/vim-ruby-conque.vim similarity index 100% rename from vim/plugin/settings/vim-ruby-conque.vim rename to vim/settings/vim-ruby-conque.vim diff --git a/vim/plugin/settings/vim-ruby-debugger.vim b/vim/settings/vim-ruby-debugger.vim similarity index 100% rename from vim/plugin/settings/vim-ruby-debugger.vim rename to vim/settings/vim-ruby-debugger.vim diff --git a/vim/plugin/settings/yadr-appearance.vim b/vim/settings/yadr-appearance.vim similarity index 100% rename from vim/plugin/settings/yadr-appearance.vim rename to vim/settings/yadr-appearance.vim diff --git a/vim/plugin/settings/yadr-append-semicolon.vim b/vim/settings/yadr-append-semicolon.vim similarity index 100% rename from vim/plugin/settings/yadr-append-semicolon.vim rename to vim/settings/yadr-append-semicolon.vim diff --git a/vim/plugin/settings/yadr-guioptions.vim b/vim/settings/yadr-guioptions.vim similarity index 100% rename from vim/plugin/settings/yadr-guioptions.vim rename to vim/settings/yadr-guioptions.vim diff --git a/vim/plugin/settings/yadr-keymap.vim b/vim/settings/yadr-keymap.vim similarity index 100% rename from vim/plugin/settings/yadr-keymap.vim rename to vim/settings/yadr-keymap.vim diff --git a/vim/plugin/settings/yadr-search.vim b/vim/settings/yadr-search.vim similarity index 100% rename from vim/plugin/settings/yadr-search.vim rename to vim/settings/yadr-search.vim diff --git a/vim/plugin/settings/yadr-sudo-write.vim b/vim/settings/yadr-sudo-write.vim similarity index 100% rename from vim/plugin/settings/yadr-sudo-write.vim rename to vim/settings/yadr-sudo-write.vim diff --git a/vim/plugin/settings/yadr-whitespace-killer.vim b/vim/settings/yadr-whitespace-killer.vim similarity index 100% rename from vim/plugin/settings/yadr-whitespace-killer.vim rename to vim/settings/yadr-whitespace-killer.vim diff --git a/vim/plugin/settings/yadr-window-killer.vim b/vim/settings/yadr-window-killer.vim similarity index 100% rename from vim/plugin/settings/yadr-window-killer.vim rename to vim/settings/yadr-window-killer.vim diff --git a/vim/plugin/settings/yadr-wrapping.vim b/vim/settings/yadr-wrapping.vim similarity index 100% rename from vim/plugin/settings/yadr-wrapping.vim rename to vim/settings/yadr-wrapping.vim diff --git a/vim/plugin/settings/yankring.vim b/vim/settings/yankring.vim similarity index 100% rename from vim/plugin/settings/yankring.vim rename to vim/settings/yankring.vim diff --git a/vimrc b/vimrc index 8d3cb65..489daa4 100644 --- a/vimrc +++ b/vimrc @@ -101,3 +101,7 @@ set wildignore+=*.png,*.jpg,*.gif set scrolloff=8 "Start scrolling when we're 8 lines away from margins set sidescrolloff=15 set sidescroll=1 + + +" ================ Custom Settings ======================== +so ~/.yadr/vim/settings.vim