Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Some miscelleneous changes.

  • Loading branch information...
commit 4e31e29ea7fd0e1d2cec41232325c595abd01e40 1 parent 2db0142
Chris Miller authored
Showing with 13 additions and 3 deletions.
  1. +4 −1 README.md
  2. +6 −0 git/gitconfig.symlink
  3. +3 −2 vim/vimrc.symlink
View
5 README.md
@@ -23,7 +23,7 @@ order anyway:
* Homebrew
* Install `macvim`
* Install `autoenv`
- * Install `rbenv` and `ruby-build`
+ * Install `rbenv`, `rbenv-bundler`, and `ruby-build`
* If still behind that freakin annoying work firewall, install
`corkscrew`
* Set default shell to ZSH
@@ -92,5 +92,8 @@ and then set that folder or URL to:
Obviously you'll want to mangle that based on the local username. Reload
iTerm2, and everything should be exactly as it should be. Fun, no?
+If the theme doesn't come on over, try installing [Liquid Carbon][lq].
+
[skwp-dotfiles]: https://github.com/skwp/dotfiles
[holman-dotfiles]: https://github.com/holman/dotfiles
+[lq]: https://github.com/markcho/iTerm2_LiquidCarbon
View
6 git/gitconfig.symlink
@@ -8,3 +8,9 @@
excludesfile = /Users/cmiller/.gitignore_global
[push]
default = tracking
+[difftool "sourcetree"]
+ cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+ path =
+[mergetool "sourcetree"]
+ cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+ trustExitCode = true
View
5 vim/vimrc.symlink
@@ -106,12 +106,13 @@
Bundle 'pangloss/vim-javascript'
Bundle 'briancollins/vim-jst'
Bundle 'kchmck/vim-coffee-script'
+ Bundle 'ap/vim-css-color'
+ Bundle 'hail2u/vim-css3-syntax'
" }
" HTML, CSS, SASS, & friends {
Bundle 'amirh/HTML-AutoCloseTag'
Bundle 'ChrisYip/Better-CSS-Syntax-for-Vim'
- Bundle 'ap/vim-css-color'
Bundle 'tpope/vim-haml'
Bundle 'cakebaker/scss-syntax.vim'
" }
@@ -255,7 +256,7 @@
scriptencoding utf-8
" slightly less annoying command failures
- set shortmess+=filmnrxoOtT
+ "set shortmess+=filmnrxoOtT
" view folds, cursor, and other things i don't know about
set viewoptions=folds,options,cursor,unix,slash
" go one past line end for slightly more betterer editing experience
Please sign in to comment.
Something went wrong with that request. Please try again.