Merge pull request #11 from kylewest/cleanup

Further cleanups from kylewest
This commit is contained in:
Yan Pritzker 2012-01-24 12:18:51 -08:00
commit 36d6fecb11
5 changed files with 265 additions and 154 deletions

71
.gitmodules vendored
View File

@ -1,213 +1,284 @@
[submodule "KeyBindings"]
path = KeyBindings
url = https://github.com/ttscoff/KeyBindings.git
ignore=dirty
[submodule "vim/bundle/raimondi-delimitMate"]
path = vim/bundle/raimondi-delimitMate
url = https://github.com/Raimondi/delimitMate
ignore=dirty
[submodule "vim/bundle/godlygeek-csapprox"]
path = vim/bundle/godlygeek-csapprox
url = https://github.com/godlygeek/csapprox.git
ignore=dirty
[submodule "vim/bundle/vim-scripts-AnsiEsc"]
path = vim/bundle/vim-scripts-AnsiEsc
url = https://github.com/vim-scripts/AnsiEsc.vim.git
ignore=dirty
[submodule "vim/bundle/garbas-vim-showmarks"]
path = vim/bundle/garbas-vim-showmarks
url = https://github.com/garbas/vim-showmarks
ignore=dirty
[submodule "vim/bundle/skwp-vim-ruby-conque"]
path = vim/bundle/skwp-vim-ruby-conque
url = https://github.com/skwp/vim-ruby-conque
ignore=dirty
[submodule "vim/bundle/kogakure-vim-sparkup"]
path = vim/bundle/kogakure-vim-sparkup
url = https://github.com/kogakure/vim-sparkup.git
ignore=dirty
[submodule "vim/bundle/tomtom-tcomment_vim"]
path = vim/bundle/tomtom-tcomment_vim
url = https://github.com/tomtom/tcomment_vim.git
ignore=dirty
[submodule "vim/bundle/nelstrom-vim-markdown-preview"]
path = vim/bundle/nelstrom-vim-markdown-preview
url = https://github.com/nelstrom/vim-markdown-preview
ignore=dirty
[submodule "vim/bundle/scrooloose-nerdtree"]
path = vim/bundle/scrooloose-nerdtree
url = https://github.com/scrooloose/nerdtree.git
ignore=dirty
[submodule "vim/bundle/jistr-vim-nerdtree-tabs"]
path = vim/bundle/jistr-vim-nerdtree-tabs
url = https://github.com/jistr/vim-nerdtree-tabs.git
ignore=dirty
[submodule "vim/bundle/vim-scripts-AutoTag"]
path = vim/bundle/vim-scripts-AutoTag
url = https://github.com/vim-scripts/AutoTag.git
ignore=dirty
[submodule "vim/bundle/vim-scripts-IndexedSearch"]
path = vim/bundle/vim-scripts-IndexedSearch
url = https://github.com/vim-scripts/IndexedSearch
ignore=dirty
[submodule "vim/bundle/scrooloose-syntastic"]
path = vim/bundle/scrooloose-syntastic
url = https://github.com/scrooloose/syntastic.git
ignore=dirty
[submodule "vim/bundle/Lokaltog-vim-easymotion"]
path = vim/bundle/Lokaltog-vim-easymotion
url = https://github.com/Lokaltog/vim-easymotion
ignore=dirty
[submodule "vim/bundle/sjbach-lusty"]
path = vim/bundle/sjbach-lusty
url = https://github.com/sjbach/lusty.git
ignore=dirty
[submodule "vim/bundle/tjennings-git-grep-vim"]
path = vim/bundle/tjennings-git-grep-vim
url = https://github.com/tjennings/git-grep-vim
ignore=dirty
[submodule "vim/bundle/skwp-greplace"]
path = vim/bundle/skwp-greplace
url = https://github.com/skwp/greplace.vim
ignore=dirty
[submodule "vim/bundle/tpope-vim-repeat"]
path = vim/bundle/tpope-vim-repeat
url = https://github.com/tpope/vim-repeat.git
ignore=dirty
[submodule "vim/bundle/vim-scripts-taglist"]
path = vim/bundle/vim-scripts-taglist
url = https://github.com/vim-scripts/taglist.vim.git
ignore=dirty
[submodule "vim/bundle/tpope-vim-surround"]
path = vim/bundle/tpope-vim-surround
url = https://github.com/tpope/vim-surround.git
ignore=dirty
[submodule "vim/bundle/tpope-vim-rails"]
path = vim/bundle/tpope-vim-rails
url = https://github.com/tpope/vim-rails.git
ignore=dirty
[submodule "vim/bundle/vim-ruby-vim-ruby"]
path = vim/bundle/vim-ruby-vim-ruby
url = https://github.com/vim-ruby/vim-ruby.git
ignore=dirty
[submodule "vim/bundle/ecomba-vim-ruby-refactoring"]
path = vim/bundle/ecomba-vim-ruby-refactoring
url = https://github.com/ecomba/vim-ruby-refactoring
ignore=dirty
[submodule "vim/bundle/vim-scripts-matchit.zip"]
path = vim/bundle/vim-scripts-matchit.zip
url = https://github.com/vim-scripts/matchit.zip.git
ignore=dirty
[submodule "vim/bundle/skwp-vim-indexed-search"]
path = vim/bundle/skwp-vim-indexed-search
url = https://github.com/skwp/vim-indexed-search
ignore=dirty
[submodule "vim/bundle/tpope-vim-endwise"]
path = vim/bundle/tpope-vim-endwise
url = https://github.com/tpope/vim-endwise.git
ignore=dirty
[submodule "vim/bundle/skwp-vim-html-escape"]
path = vim/bundle/skwp-vim-html-escape
url = https://github.com/skwp/vim-html-escape
ignore=dirty
[submodule "vim/bundle/Shougo-neocomplcache"]
path = vim/bundle/Shougo-neocomplcache
url = https://github.com/Shougo/neocomplcache.git
ignore=dirty
[submodule "vim/bundle/skwp-vim-colors-solarized"]
path = vim/bundle/skwp-vim-colors-solarized
url = https://github.com/skwp/vim-colors-solarized
ignore=dirty
[submodule "vim/bundle/rson-vim-conque"]
path = vim/bundle/rson-vim-conque
url = https://github.com/rson/vim-conque.git
ignore=dirty
[submodule "vim/bundle/tpope-vim-pathogen"]
path = vim/bundle/tpope-vim-pathogen
url = https://github.com/tpope/vim-pathogen
ignore=dirty
[submodule "vim/bundle/drewolson-ruby_focused_unit_test_vim"]
path = vim/bundle/drewolson-ruby_focused_unit_test_vim
url = https://github.com/drewolson/ruby_focused_unit_test_vim
ignore=dirty
[submodule "vim/bundle/tpope-vim-fugitive"]
path = vim/bundle/tpope-vim-fugitive
url = https://github.com/tpope/vim-fugitive
ignore=dirty
[submodule "vim/bundle/mikefarmer-snipmate"]
path = vim/bundle/mikefarmer-snipmate
url = https://github.com/mikefarmer/snipmate.vim.git
ignore=dirty
[submodule "vim/snippets"]
path = vim/snippets
url = https://github.com/scrooloose/snipmate-snippets.git
ignore=dirty
[submodule "vim/bundle/skwp-vim-git-grep-rails-partial"]
path = vim/bundle/skwp-vim-git-grep-rails-partial
url = https://github.com/skwp/vim-git-grep-rails-partial
ignore=dirty
[submodule "vim/bundle/tpope-vim-unimpaired"]
path = vim/bundle/tpope-vim-unimpaired
url = https://github.com/tpope/vim-unimpaired
ignore=dirty
[submodule "vim/bundle/tpope-vim-git"]
path = vim/bundle/tpope-vim-git
url = https://github.com/tpope/vim-git
ignore=dirty
[submodule "vim/bundle/vim-scripts-lastpos"]
path = vim/bundle/vim-scripts-lastpos
url = https://github.com/vim-scripts/lastpos.vim
ignore=dirty
[submodule "vim/bundle/sjl-gundo"]
path = vim/bundle/sjl-gundo
url = https://github.com/sjl/gundo.vim
ignore=dirty
[submodule "vim/bundle/vim-scripts-sudo"]
path = vim/bundle/vim-scripts-sudo
url = https://github.com/vim-scripts/sudo.vim
ignore=dirty
[submodule "vim/bundle/mileszs-ack"]
path = vim/bundle/mileszs-ack
url = https://github.com/mileszs/ack.vim
ignore=dirty
[submodule "vim/bundle/mattn-zencoding-vim"]
path = vim/bundle/mattn-zencoding-vim
url = https://github.com/mattn/zencoding-vim
ignore=dirty
[submodule "vim/bundle/nelstrom-vim-textobj-rubyblock"]
path = vim/bundle/nelstrom-vim-textobj-rubyblock
url = https://github.com/nelstrom/vim-textobj-rubyblock
ignore=dirty
[submodule "vim/bundle/kana-vim-textobj-user"]
path = vim/bundle/kana-vim-textobj-user
url = https://github.com/kana/vim-textobj-user
ignore=dirty
[submodule "vim/bundle/austintaylor-vim-indentobject"]
path = vim/bundle/austintaylor-vim-indentobject
url = https://github.com/austintaylor/vim-indentobject
ignore=dirty
[submodule "vim/bundle/jpalardy-vim-slime"]
path = vim/bundle/jpalardy-vim-slime
url = https://github.com/jpalardy/vim-slime
ignore=dirty
[submodule "vim/bundle/vim-scripts-ZoomWin"]
path = vim/bundle/vim-scripts-ZoomWin
url = https://github.com/vim-scripts/ZoomWin.git
ignore=dirty
[submodule "vim/bundle/dterei-VimBookmarking"]
path = vim/bundle/dterei-VimBookmarking
url = https://github.com/dterei/VimBookmarking
ignore=dirty
[submodule "vim/bundle/kana-vim-textobj-datetime"]
path = vim/bundle/kana-vim-textobj-datetime
url = https://github.com/kana/vim-textobj-datetime
ignore=dirty
[submodule "vim/bundle/kana-vim-textobj-entire"]
path = vim/bundle/kana-vim-textobj-entire
url = https://github.com/kana/vim-textobj-entire
ignore=dirty
[submodule "vim/bundle/chrismetcalf-vim-yankring"]
path = vim/bundle/chrismetcalf-vim-yankring
url = https://github.com/chrismetcalf/vim-yankring.git
ignore=dirty
[submodule "vim/bundle/mattn-gist-vim"]
path = vim/bundle/mattn-gist-vim
url = https://github.com/mattn/gist-vim
ignore=dirty
[submodule "vim/bundle/godlygeek-tabular"]
path = vim/bundle/godlygeek-tabular
url = https://github.com/godlygeek/tabular
ignore=dirty
[submodule "vim/bundle/AndrewRadev-splitjoin"]
path = vim/bundle/AndrewRadev-splitjoin
url = https://github.com/AndrewRadev/splitjoin.vim
ignore=dirty
[submodule "vim/bundle/int3-vim-extradite"]
path = vim/bundle/int3-vim-extradite
url = https://github.com/int3/vim-extradite
ignore=dirty
[submodule "vim/bundle/vim-scripts-argtextobj"]
path = vim/bundle/vim-scripts-argtextobj
url = https://github.com/vim-scripts/argtextobj.vim
ignore=dirty
[submodule "vim/bundle/bootleq-vim-textobj-rubysymbol"]
path = vim/bundle/bootleq-vim-textobj-rubysymbol
url = https://github.com/bootleq/vim-textobj-rubysymbol
ignore=dirty
[submodule "vim/bundle/skwp-vim-rspec"]
path = vim/bundle/skwp-vim-rspec
url = https://github.com/skwp/vim-rspec
ignore=dirty
[submodule "vim/bundle/nathanaelkane-vim-indent-guides"]
path = vim/bundle/nathanaelkane-vim-indent-guides
url = https://github.com/nathanaelkane/vim-indent-guides
ignore=dirty
[submodule "vim/bundle/aaronjensen-vim-sass-status"]
path = vim/bundle/aaronjensen-vim-sass-status
url = https://github.com/aaronjensen/vim-sass-status
ignore=dirty
[submodule "vim/bundle/tpope-vim-haml"]
path = vim/bundle/tpope-vim-haml
url = https://github.com/tpope/vim-haml
ignore=dirty
[submodule "vim/bundle/kien-tabman"]
path = vim/bundle/kien-tabman
url = https://github.com/kien/tabman.vim
ignore=dirty
[submodule "vim/bundle/claco-jasmine"]
path = vim/bundle/claco-jasmine
url = https://github.com/claco/jasmine.vim
ignore=dirty
[submodule "vim/bundle/kana-vim-textobj-function"]
path = vim/bundle/kana-vim-textobj-function
url = https://github.com/kana/vim-textobj-function
ignore=dirty
[submodule "vim/bundle/kchmck-vim-coffee-script"]
path = vim/bundle/kchmck-vim-coffee-script
url = https://github.com/kchmck/vim-coffee-script
ignore=dirty
[submodule "vim/bundle/wavded-vim-stylus"]
path = vim/bundle/wavded-vim-stylus
url = https://github.com/wavded/vim-stylus
ignore=dirty
[submodule "vim/bundle/vim-scripts-Vim-R-plugin"]
path = vim/bundle/vim-scripts-Vim-R-plugin
url = https://github.com/vim-scripts/Vim-R-plugin
ignore=dirty
[submodule "vim/bundle/kien-ctrlp"]
path = vim/bundle/kien-ctrlp
url = https://github.com/kien/ctrlp.vim
ignore=dirty
[submodule "vim/bundle/majutsushi-tagbar"]
path = vim/bundle/majutsushi-tagbar
url = https://github.com/majutsushi/tagbar.git
ignore=dirty

View File

@ -1 +0,0 @@
system

1
.rvmrc
View File

@ -1 +0,0 @@
rvm system

View File

@ -58,6 +58,55 @@ For the love of all that is holy, stop abusing your hands!
Remap caps-lock to escape: http://pqrs.org/macosx/keyremap4macbook/extra.html
## Dependencies
YADR is opinionated. To get the most out of using it, you should install
all the software it depends on.
### [Homebrew](http://mxcl.github.com/homebrew/)
Homebrew is _the missing package manager for OSX_. To install:
```bash
/usr/bin/ruby -e "$(curl -fsSL https://raw.github.com/gist/323731)"
```
With homebrew installed, install some packages:
```bash
brew install ack ctags git hub imagemagick macvim
```
### [ctags](http://ctags.sourceforge.net/)
Vim will complain every time you save a file if you do not have ctags installed correctly. We
assume you have installed ctags via homebrew. If you have homebrew setup correctly running
`which ctags` should output `/usr/local/bin/ctags`. If you get something else do this:
Make sure `/usr/local/bin` is before `/usr/bin` in your PATH.
If that doesn't work, move the OSX supplies ctags [like so](http://www.mattpolito.info/post/1648956809/ctags-got-you-down):
```bash
sudo mv /usr/bin/ctags /usr/bin/ctags_original
```
### [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
```bash
curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh
```
### [Pry](http://pry.github.com/)
Pry offers a much better out of the box IRB experience with colors, tab completion, and lots of other tricks. You should:
```bash
gem install pry
gem install awesome_print
```
## Installation
This project uses git submodules for its plugins, but this is handled
@ -258,7 +307,7 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
* ,t - CtrlP fuzzy file selector
* ,b - CtrlP buffer selector
* Cmd-Shift-P - Clear CtrlP cache
* ,jm jump (command-t) app/models
* ,jm jump (via CtrlP) app/models
* ,jc app/controllers
* ,jv app/views
* ,jh app/helpers

View File

@ -3,17 +3,10 @@ require File.join(File.dirname(__FILE__), 'default_libs')
GitStyleBinary.command do
version "yadr-init-plugins 1.0"
short_desc "Initialize all submodules. Run this every time you pull a new yadr version."
short_desc "Initialize all submodules. Run this every time you pull a new yadr version."
run do |command|
system("cd ~/.dotfiles && git submodule init && git submodule update")
# Compile Command-T
if File.directory?(File.expand_path("~/.dotfiles/vim/bundle/skwp-Command-T"))
puts "Compiling Command-T plugin..."
system("cd ~/.dotfiles/vim/bundle/skwp-Command-T && rake make")
end
end
end