Merge branch 'master' of https://github.com/tedkulp/dotfiles

.gitignore

@@ -0,0 +1 @@
+link-private

README.md

@@ -5,32 +5,40 @@
   to install the command line tools)
 
 ```
-    git clone --recursive https://github.com/tedkulp/dotfiles.git ~/dotfiles
+git clone --recursive https://github.com/tedkulp/dotfiles.git ~/dotfiles
 ```
 
 * Optionally, run the osx script. This will set a bunch of sensible Mac defaults.
 
 ```
-    ~/dotfiles/osx
+~/dotfiles/osx
 ```
 
 * Run the brew command. Make a sandwich... get a nice beverage...  maybe see if something
   is on Netflix. This will install a lot of software from source.
 
 ```
-    ~/dotfiles/brew
+~/dotfiles/brew
 ```
 
 * Now, optionally, run the cask command. This will install some nice Mac software.
 
 ```
-    ~/dotfiles/cask
+~/dotfiles/cask
+```
+
+* Setup Dropbox and let it sync. We need the link-private directory for all our ssh and
+  gnupg stuff
+
+* After Dropbox is synced, link up the link-private directory to your dotfiles.
+
+```
+ln -s ~/Dropbox/link-private ~/dotfiles/
 ```
 
 * Run the dotfiles command. This will symlink everything into place in your home
-  directory. If you have some secret files to put into the dotfiles/copy directory,
-  now would be a good time.
+  directory.
 
 ```
-    ~/dotfiles/dotfiles
+~/dotfiles/dotfiles
 ```

brew

@@ -31,13 +31,19 @@ brew install apple-gcc42
 brew install chruby
 brew install coreutils
 brew install elixir
+brew install gdbm
 brew install git
 brew install git-flow
 brew install go
 brew install heroku-toolbelt
+brew install hub
 brew install leiningen
+brew install libffi
+brew install libyaml
 brew install macvim --override-system-vim
 brew install maven
+brew install openssl
+brew install readline
 brew install reattach-to-user-namespace
 brew install ruby-install
 brew install tmux

cask

@@ -24,6 +24,7 @@ if [ -x "$brew_path" ] ; then
   installcask istat-menus
   installcask rdio
   installcask sizeup
+  installcask skitch
   installcask skype
   installcask sublime-text
   installcask vagrant

dotfiles

@@ -8,6 +8,10 @@ function link_file() {
 	ln -sf ${2#$HOME/} ~/
 }
 
+function link-private_file() {
+	ln -sf ${2#$HOME/} ~/
+}
+
 function copy_file() {
 	cp -f $2 ~/
 }
@@ -18,7 +22,7 @@ function post_file() {
 
 function copy_or_link() {
 	local base dest
-	local cmd="find $HOME/dotfiles/$1 -mindepth 1 -maxdepth 1"
+	local cmd="find -L $HOME/dotfiles/$1 -mindepth 1 -maxdepth 1"
 
 	# If no files, bail
 	if [ "x`${cmd}`" == "x" ]; then return; fi
@@ -33,5 +37,6 @@ function copy_or_link() {
 }
 
 copy_or_link "link"
+copy_or_link "link-private"
 copy_or_link "copy"
 copy_or_link "post"

link/.powconfig

@@ -0,0 +1,2 @@
+source /usr/local/opt/chruby/share/chruby/chruby.sh
+chruby ruby-2.0

link/.tmux.conf

@@ -22,6 +22,9 @@ bind C-a last-window
 bind | split-window -h
 bind - split-window -v
 
+# Use multiple sessions -- it's da bomb, yo
+bind C-s choose-session
+
 # Move between panes vim style
 bind h select-pane -L
 bind j select-pane -D

osx

@@ -178,9 +178,9 @@ defaults write com.apple.BezelServices kDimTime -int 300
 # Note: if you’re in the US, replace `EUR` with `USD`, `Centimeters` with
 # `Inches`, `en_GB` with `en_US`, and `true` with `false`.
 defaults write NSGlobalDomain AppleLanguages -array "en" "nl"
-defaults write NSGlobalDomain AppleLocale -string "en_GB@currency=EUR"
-defaults write NSGlobalDomain AppleMeasurementUnits -string "Centimeters"
-defaults write NSGlobalDomain AppleMetricUnits -bool true
+defaults write NSGlobalDomain AppleLocale -string "en_US@currency=USD"
+defaults write NSGlobalDomain AppleMeasurementUnits -string "Inches"
+defaults write NSGlobalDomain AppleMetricUnits -bool false
 
 # Set the timezone; see `systemsetup -listtimezones` for other values
 systemsetup -settimezone "America/New_York" > /dev/null

post/fix-ssh-perms

@@ -0,0 +1,2 @@
+chmod 700 ~/.ssh
+chmod 600 ~/.ssh/*

source/aliases.zsh

@@ -1,2 +1,4 @@
 alias myip='curl -s ifconfig.me | tee /dev/stderr | pbcopy'
 alias be='bundle exec'
+
+alias history='fc -l 1'

source/git.zsh

@@ -0,0 +1,4 @@
+alias ghm='git push heroku master'
+
+# For "hub" http://hub.github.com/
+eval "$(hub alias -s)"

source/history.zsh

@@ -0,0 +1 @@
+bindkey '^r' history-incremental-search-backward

source/nvm.zsh

@@ -1,6 +1,7 @@
 if [[ -d $HOME/.nvm ]]; then
   [ -s $HOME/.nvm/nvm.sh ] && . $HOME/.nvm/nvm.sh  # This loads NVM
 else
-  echo ""
   echo "You don't have nvm installed. Get at it, buddy!"
+  echo "hint: curl https://raw.github.com/creationix/nvm/master/install.sh | sh"
+  echo ""
 fi

source/tmux.zsh

@@ -0,0 +1,2 @@
+alias tmuxc='tmux new-session'
+alias tmuxcn='tmux new-session -s '