Merge branch 'master' of git://github.com/dustinswan/dotfiles

master
Dustin Swan 13 years ago
commit 3cdafadded

9
.gitmodules vendored

@ -70,3 +70,12 @@
[submodule "vim/bundle/MatchTag"] [submodule "vim/bundle/MatchTag"]
path = vim/bundle/MatchTag path = vim/bundle/MatchTag
url = git://github.com/gregsexton/MatchTag url = git://github.com/gregsexton/MatchTag
[submodule "vim/bundle/vim-rails"]
path = vim/bundle/vim-rails
url = git://github.com/tpope/vim-rails
[submodule "vim/bundle/endwise"]
path = vim/bundle/endwise
url = git://github.com/tpope/vim-endwise
[submodule "vim/bundle/ctrlp"]
path = vim/bundle/ctrlp
url = git://github.com/kien/ctrlp.vim

@ -1 +1 @@
Subproject commit 757fa3314d1c041ab715dbda838f3e9b2ff9ce17 Subproject commit 7c36ef7faa65441f8eec27589f24ba9f18f8d66c

@ -1 +1 @@
Subproject commit 85aba995c95b9b184f351f4aaad8ba76087484e5 Subproject commit 224aa0955a522c59b1f9074199400a5da1a804ce

@ -1 +1 @@
Subproject commit 22098a8ff91f2ea393c20fdec2009f8a455628ca Subproject commit c7702ab0d6eb5bf10dc7cd12004e9d3f693f0fd3

@ -1 +1 @@
Subproject commit 254d2307015370424034c0298a1148c4a7add069 Subproject commit 060109359b81b53dfad7206e23f86007d895996f

@ -0,0 +1 @@
Subproject commit bf03741650aae253b9fbfdb5526d6a7b818a060d

@ -1 +1 @@
Subproject commit cdecdc56f938840cad250aecd58c1901f04c4d1b Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4

@ -0,0 +1 @@
Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d

@ -1 +1 @@
Subproject commit 5f5c8da61fd817ba8dc091350b51c1ab7ca53c8d Subproject commit b4b75ef682da3e946c648d3634ade39d0af49aba

@ -1 +1 @@
Subproject commit 9990a767695c78a44611ce33fb2dbc25c83d8827 Subproject commit e66f9019b4eca05d7f5dfe38c742cf42e641e98d

@ -1 +1 @@
Subproject commit b28e7be63235982501ab7dd30c03ea7feef7b095 Subproject commit 0fe4938d22ae6bbfca054820909c9f176fbf3644

@ -1 +1 @@
Subproject commit 2dd198c6c412b4ddd361b43586b01981e8383239 Subproject commit 30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc

@ -1 +1 @@
Subproject commit c4101c205ef9e06bdfeff571a7dbba2576f08974 Subproject commit cdffdd43816ddaeee858ae42da3ab6ddcfa25d19

@ -1 +1 @@
Subproject commit bfe6d4eeecfb82fb792fdbe4a76411c5ff11ffff Subproject commit 7d11d000019f202bae7905bda838517849b1dd3b

@ -1 +1 @@
Subproject commit 0c062c9ff864d2b7d653c6ea80cf1cf4f65d5540 Subproject commit 5a37c7e75299f34b8a93deb867032c7668724572

@ -1 +1 @@
Subproject commit 80ec6539e4139a2e0281a0f1e36d5038d55ad980 Subproject commit 688b5d706c21fbc6b2db6499f3cfbdeb35309b5a

@ -1 +1 @@
Subproject commit d9e6bfdd902fc661c8fd58ede248ccfc3b3039d7 Subproject commit 4eb2cdfccc016889acfa3b5d63e8f390a87863cf

@ -1 +1 @@
Subproject commit cf6aa9a4143704e0e3070302ffe593636d6e8cc9 Subproject commit d14b53e903e34b967a3fc8a5f72251c02ade4e7e

@ -1 +1 @@
Subproject commit 3c075654d424c6e3c20521bd4567b517a2410593 Subproject commit f3973b1817ef4be3062e2c268755a63bec68740c

@ -1 +1 @@
Subproject commit a1644f0401ab0ff7325b06d44de6e6ec0304384d Subproject commit d66948917ce7153e4a961aa5d57e1b0918e20495

@ -1 +1 @@
Subproject commit 940d04f459601b79ab26345ba846c3ad73cf160b Subproject commit 981b39bd2dcd839746509328e69c5053b8871d04

@ -1 +1 @@
Subproject commit 0f6ef1b7ce97f387cc12985a26b5ab4dcb196df3 Subproject commit 3c2a265b89d1d9848633cfc1642d2e78ecd73a25

@ -0,0 +1 @@
Subproject commit e45164cbba5beee4bd65096dad31f31124a2cc18

@ -5,7 +5,8 @@ ZSH=$HOME/dotfiles/oh-my-zsh
# Look in ~/.oh-my-zsh/themes/ # Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each # Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded. # time that oh-my-zsh is loaded.
ZSH_THEME="robbyrussell" # ZSH_THEME="robbyrussell"
ZSH_THEME="sunrise"
# Set to this to use case-sensitive completion # Set to this to use case-sensitive completion
# CASE_SENSITIVE="true" # CASE_SENSITIVE="true"
@ -24,7 +25,7 @@ COMPLETION_WAITING_DOTS="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(git archlinux npm vi-mode node osx) plugins=(git archlinux npm vi-mode node osx ruby rails3 gem)
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh

Loading…
Cancel
Save