diff --git a/Readme.md b/Readme.md index 0898a0e..2b91275 100644 --- a/Readme.md +++ b/Readme.md @@ -14,10 +14,36 @@ It’will clone latest version of dotfiles to `~/dotfiles` and make symlinks in cd ~/dotfiles && git pull && ./sync.py ``` +## Screenshot + +!(http://cl.ly/image/3q3B1S0O2m0f/Screen%20Shot%202012-10-19%20at%2015.28.31.png) + +## Features + +* Custom Bash prompt, useful aliases, etc. +* Git config, Git global ignore file. +* Dotfiles syncronization (`sync.py`). +* Sensible OS X defaults (`setup/osx.sh`). +* Sublime Text 2 settings syncronization and packages autoinstall (`setup/sublime-settings.sh` and `setup/sublime-packages.sh`). +* Bash4 install script (`setup/bash.sh`) +* Homebrew bootstrap (`setup/brew.sh`) + +## Further customization + +* Add any Bash profile customizations to `~/.bashlocal`. +* Add your git username/email/etc. to `~/.gitlocal`. +* Just fork this repo and hack on. + ## Resources +* [GitHub ❤ ~/](http://dotfiles.github.com/) * [Mathias’s dotfiles](https://github.com/mathiasbynens/dotfiles) * [Jan Moesen’s dotfiles](https://github.com/janmoesen/tilde) +* [Nicolas Gallagher’s dotfiles](https://github.com/necolas/dotfiles) +* [Zach Holman’s dotfiles](https://github.com/holman/dotfiles) +* [Jacob Gillespie’s dotfiles](https://github.com/jacobwg/dotfiles) +* [Yet Another Dotfile Repo](https://github.com/skwp/dotfiles) +* [Mac OS X Lion Setup](https://github.com/ptb/Mac-OS-X-Lion-Setup) * [Yet another cool story about bash prompt](http://habrahabr.ru/company/mailru/blog/145008/) (in Russian) --- diff --git a/bash_profile b/bash_profile index 2e68d04..cedbf1e 100644 --- a/bash_profile +++ b/bash_profile @@ -36,9 +36,6 @@ PATH="/usr/local/bin:$PATH" command -v brew >/dev/null 2>&1 && PATH="$(brew --prefix coreutils)/libexec/gnubin:$PATH" export PATH -# Load extra (private) settings -[ -r "~/.extra" ] && source "~/.extra" - # Load prompt and aliases for file in ~/dotfiles/includes/{bash_prompt,bash_aliases,bash_functions}; do [ -r "$file" ] && source "$file" @@ -90,3 +87,6 @@ less_options=( export LESS="${less_options[*]}"; unset less_options; export PAGER='less'; + +# Load extra (private) settings +[ -r "~/.bashlocal" ] && source "~/.bashlocal" diff --git a/includes/bash_aliases.sh b/includes/bash_aliases.sh index 366b2cc..d06053c 100644 --- a/includes/bash_aliases.sh +++ b/includes/bash_aliases.sh @@ -61,7 +61,7 @@ alias hide="defaults write com.apple.Finder AppleShowAllFiles -bool false && kil # (useful when executing time-consuming commands) #alias badge="tput bel" -# HTTP requests +# HTTP requests by @janmoesen for method in GET HEAD POST PUT DELETE TRACE OPTIONS; do alias "$method"="lwp-request -m '$method'" done diff --git a/setup/Readme.md b/setup/Readme.md index 4bc63c3..2410239 100644 --- a/setup/Readme.md +++ b/setup/Readme.md @@ -1,10 +1,16 @@ ## Prerequisites * [Command Line Tools for Xcode](https://developer.apple.com/downloads) -* [homebrew](http://mxcl.github.com/homebrew/) * [node.js](http://nodejs.org/) +### [Git-friendly](https://github.com/jamiew/git-friendly) + +```bash +sudo bash < <( curl https://raw.github.com/jamiew/git-friendly/master/install.sh) +``` + + ### How to remove US English keyboard layout on Mac OS X Useful when you use some kind of [typography layout](http://ilyabirman.ru/projects/typography-layout/). diff --git a/setup/brew.sh b/setup/brew.sh index 7af8bc3..76508bb 100755 --- a/setup/brew.sh +++ b/setup/brew.sh @@ -1,6 +1,9 @@ #!/bin/bash # Based on https://github.com/mathiasbynens/dotfiles/blob/master/.brew +# Setup Homebrew +command -v brew >/dev/null 2>&1 || ruby -e "$(curl -fsSkL raw.github.com/mxcl/homebrew/go)" + # Make sure we’re using the latest Homebrew brew update