Permalink
Browse files

Save changes before submodule update

  • Loading branch information...
1 parent db0de10 commit 65322ae8b1a3b572a05b7dd1e06c113d9e9a5820 coutud committed Sep 10, 2011
Showing with 39 additions and 22 deletions.
  1. +11 −11 .gitmodules
  2. +1 −0 ackrc
  3. +1 −0 bash_profile
  4. +20 −9 irbrc
  5. +3 −0 vim/.netrwhist
  6. +1 −1 vimrc
  7. +2 −1 zsh/load_oh_my_zsh
View
@@ -1,33 +1,33 @@
[submodule "vim/bundle/checksyntax"]
path = vim/bundle/checksyntax
- url = git://github.com/tomtom/checksyntax_vim.git
+ url = https://github.com/tomtom/checksyntax_vim.git
[submodule "vim/bundle/nerdcommenter"]
path = vim/bundle/nerdcommenter
- url = git://github.com/scrooloose/nerdcommenter.git
+ url = https://github.com/scrooloose/nerdcommenter.git
[submodule "vim/bundle/vim-abolish"]
path = vim/bundle/vim-abolish
- url = git://github.com/tpope/vim-abolish.git
+ url = https://github.com/tpope/vim-abolish.git
[submodule "vim/bundle/vim-haml"]
path = vim/bundle/vim-haml
- url = git://github.com/tpope/vim-haml.git
+ url = https://github.com/tpope/vim-haml.git
[submodule "vim/bundle/vim-surround"]
path = vim/bundle/vim-surround
- url = git://github.com/tpope/vim-surround.git
+ url = https://github.com/tpope/vim-surround.git
[submodule "vim/bundle/vim-rails"]
path = vim/bundle/vim-rails
- url = git://github.com/tpope/vim-rails.git
+ url = https://github.com/tpope/vim-rails.git
[submodule "vim/bundle/nerdtree"]
path = vim/bundle/nerdtree
- url = git://github.com/scrooloose/nerdtree.git
+ url = https://github.com/scrooloose/nerdtree.git
[submodule "vim/bundle/vim-fugitive"]
path = vim/bundle/vim-fugitive
- url = git://github.com/tpope/vim-fugitive.git
+ url = https://github.com/tpope/vim-fugitive.git
[submodule "vim/bundle/vim-markdown"]
path = vim/bundle/vim-markdown
- url = git://github.com/tpope/vim-markdown.git
+ url = https://github.com/tpope/vim-markdown.git
[submodule "zsh/oh-my-zsh"]
path = zsh/oh-my-zsh
- url = git://github.com/robbyrussell/oh-my-zsh.git
+ url = https://github.com/robbyrussell/oh-my-zsh.git
[submodule "vim/bundle/vim-align"]
path = vim/bundle/vim-align
- url = git://github.com/tsaleh/vim-align.git
+ url = https://github.com/tsaleh/vim-align.git
View
1 ackrc
@@ -0,0 +1 @@
+-a
View
@@ -1,3 +1,4 @@
if [ -f ~/.bashrc ]; then
source ~/.bashrc
fi
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
View
29 irbrc
@@ -1,25 +1,36 @@
#!/usr/bin/ruby
-require 'irb/completion'
require 'irb/ext/save-history'
IRB.conf[:SAVE_HISTORY] = 1000
IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb_history"
IRB.conf[:PROMPT_MODE] = :SIMPLE
-%w[rubygems looksee/shortcuts wirble].each do |gem|
- begin
- require gem
- rescue LoadError => err
- warn "Couldn't load #{gem} : #{err}"
+require 'rubygems'
+
+begin
+ require 'looksee'
+rescue LoadError => err
+end
+
+begin
+ require 'wirble'
+ if Wirble
+ Wirble.init
+ Wirble.colorize
end
+rescue LoadError => err
end
-if Wirble
- Wirble.init
- Wirble.colorize
+begin
+ require 'bond'
+ Bond.start
+rescue LoadError => err
+ warn "Couldn't load bond gem"
+ require 'irb/completion'
end
+
class Object
# list methods which aren't in superclass
def local_methods(obj = self)
View
@@ -0,0 +1,3 @@
+let g:netrw_dirhistmax =10
+let g:netrw_dirhist_cnt =1
+let g:netrw_dirhist_1='/home/wam/Dev/scube/vendor/plugins/localized_language_select/lib/localized_language_select'
View
2 vimrc
@@ -153,7 +153,7 @@ let mapleader = ","
autocmd User Rails Rnavcommand factory spec/factories -glob=**/*.rb -suffix=
autocmd User Rails Rnavcommand scss app/stylesheets -glob=**/* -suffix=
- autocmd FileType haml set foldmethod=indent
+ "autocmd FileType haml set foldmethod=indent
",o for a new line below
" End of remapping
View
@@ -16,7 +16,8 @@ export DISABLE_AUTO_UPDATE="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git rails ruby vi-mode)
+# Could also add vi-mode
+plugins=(git rails ruby)
source $ZSH/oh-my-zsh.sh

0 comments on commit 65322ae

Please sign in to comment.