Merge branch 'master' of github.com:mattly/dotfiles

mattly · Mar 27, 2012 · f50ecff · f50ecff
2 parents 6e6776c + 6e93385
commit f50ecff
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/install.rb b/install.rb
@@ -8,8 +8,6 @@
 `git submodule init`
 `git submodule update`
 
-`cd vim/bundle/command-t.git && rake make`
-
 Dir['*'].each do |file|
   next if file =~ /install.rb/
   target = File.join(home, ".#{file}")

diff --git a/vimrc b/vimrc
@@ -67,7 +67,7 @@
     endif
   endif
 
-  let colors='solarized'
+  let colors='molokai'
   if g:colors == 'molokai'
     let g:molokai_original=1
     colorscheme molokai
@@ -249,7 +249,7 @@
 
 " Spelling
 " =============================================================================
-  set spell spelllang=en_us             " When you need it, you need it.
+  set spelllang=en_us                   " When you need it, you need it.
   " toggle spelling
   nnoremap <Leader>ss :setlocal spell!<CR>
   " n: next, p: previous, a: add, ?: suggest

diff --git a/zsh/50_aliases.zsh b/zsh/50_aliases.zsh
@@ -21,7 +21,6 @@ alias bzip='bzip2 -kz'
 alias bunzip='bzip2 -kd'
 
 # git
-alias git=hub
 alias tig='tig --all'
 
 # ruby