From 65f843268a54ec6c893ebf2c3e3705686ab13626 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 11:00:25 -0500 Subject: [PATCH 01/16] Add hint to install nvm --- source/nvm.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/nvm.zsh b/source/nvm.zsh index d4a0026..2ca69f5 100644 --- a/source/nvm.zsh +++ b/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 From a2696f06c0aaa5c277293c60486404c0cc89f488 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 11:00:41 -0500 Subject: [PATCH 02/16] Added prereqs for building ruby to brew script --- brew | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/brew b/brew index 9280210..9e0a683 100755 --- a/brew +++ b/brew @@ -31,13 +31,18 @@ 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 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 From 491e3ec21d101b90af694e2ce0a488e3fcd49e9a Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 11:04:35 -0500 Subject: [PATCH 03/16] Add redis formula --- brew | 1 + 1 file changed, 1 insertion(+) diff --git a/brew b/brew index 9e0a683..1a44ab1 100755 --- a/brew +++ b/brew @@ -53,5 +53,6 @@ brew install https://raw.github.com/falsecz/homebrew-misc/master/Formula/git-wtf # At the end, because they require user intervention brew install mongodb brew install postgresql +brew install redis brew cleanup From 49369f3c2a939005a6ce05861e82e9cd20a771f5 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 11:42:32 -0500 Subject: [PATCH 04/16] Added note about Dropbox and link-private --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 4b2efec..475df6e 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,15 @@ ~/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. From 2e88904cc8d524e6406e3a54f6e609ea531db07e Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 11:43:06 -0500 Subject: [PATCH 05/16] Fix code indents --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 475df6e..31a9d79 100644 --- a/README.md +++ b/README.md @@ -5,26 +5,26 @@ 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 @@ -41,5 +41,5 @@ ln -s ~/Dropbox/link-private ~/dotfiles/ now would be a good time. ``` - ~/dotfiles/dotfiles +~/dotfiles/dotfiles ``` From c5d138f6b36e537e80174854c4924251729ae131 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 12:01:06 -0500 Subject: [PATCH 06/16] Added link-private function. Updated README. --- .gitignore | 1 + README.md | 3 +-- dotfiles | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c85396f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +link-private diff --git a/README.md b/README.md index 31a9d79..155de2e 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,7 @@ 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 diff --git a/dotfiles b/dotfiles index 358ca29..47c598f 100755 --- a/dotfiles +++ b/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" From 1f5dd0be6f4c2b61f0eb694eb951848b208a7db7 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 13:33:38 -0500 Subject: [PATCH 07/16] Added post script to fix ssh directory permissions --- post/fix-ssh-perms | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 post/fix-ssh-perms diff --git a/post/fix-ssh-perms b/post/fix-ssh-perms new file mode 100644 index 0000000..d851b2a --- /dev/null +++ b/post/fix-ssh-perms @@ -0,0 +1,2 @@ +chmod 700 ~/.ssh +chmod 600 ~/.ssh/* From e5eadcf6f25aed8da3f0b14bf263ee32fd890873 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 15:29:17 -0500 Subject: [PATCH 08/16] We're in the US, silly. --- osx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osx b/osx index e774722..cb80739 100755 --- a/osx +++ b/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 From 3b49ff52e756e20361ec48b8d12c1765f9ddf16a Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 20:22:58 -0500 Subject: [PATCH 09/16] Start place for git aliases. Add a heroku push. --- source/git.zsh | 1 + 1 file changed, 1 insertion(+) create mode 100644 source/git.zsh diff --git a/source/git.zsh b/source/git.zsh new file mode 100644 index 0000000..abd4dc1 --- /dev/null +++ b/source/git.zsh @@ -0,0 +1 @@ +alias ghm='git push heroku master' From 928b78b880f6315a12d6d3d9fa7841dfb76bd57f Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 20:23:12 -0500 Subject: [PATCH 10/16] Add new alias file for tmux. Add new-session aliases. --- source/tmux.zsh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 source/tmux.zsh diff --git a/source/tmux.zsh b/source/tmux.zsh new file mode 100644 index 0000000..7cea0f2 --- /dev/null +++ b/source/tmux.zsh @@ -0,0 +1,2 @@ +alias tmuxc='tmux new-session' +alias tmuxcn='tmux new-session -s ' From 2261314fa68f421baae56334f3a877d3688d1d98 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 10 Nov 2013 20:23:31 -0500 Subject: [PATCH 11/16] Add a .powconfig so Pow! and chruby play together --- link/.powconfig | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 link/.powconfig diff --git a/link/.powconfig b/link/.powconfig new file mode 100644 index 0000000..5082a32 --- /dev/null +++ b/link/.powconfig @@ -0,0 +1,2 @@ +source /usr/local/opt/chruby/share/chruby/chruby.sh +chruby ruby-2.0 From 5336da1fa300f806824b76252001f8d422a8ec72 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Mon, 11 Nov 2013 19:47:32 -0500 Subject: [PATCH 12/16] Add tmux shortcut for choose-session --- link/.tmux.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/link/.tmux.conf b/link/.tmux.conf index 780a0fd..77de51b 100644 --- a/link/.tmux.conf +++ b/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 From 007de102635ad3976517f92044c7235ba224a312 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Wed, 13 Nov 2013 21:14:55 -0500 Subject: [PATCH 13/16] Install Skitch --- cask | 1 + 1 file changed, 1 insertion(+) diff --git a/cask b/cask index cdff757..d929fe7 100755 --- a/cask +++ b/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 From 76802736f79186b833c8fde45eb5cdbdd7bd3349 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Fri, 15 Nov 2013 06:33:20 -0500 Subject: [PATCH 14/16] Alias history to use fc instead --- source/aliases.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/aliases.zsh b/source/aliases.zsh index 5f5a96d..544e8bc 100644 --- a/source/aliases.zsh +++ b/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' From f1abf8458f4eb4fb5af95f75ce5cccf9407dd9f6 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Mon, 18 Nov 2013 07:48:06 -0500 Subject: [PATCH 15/16] Added ctrl-r back --- source/history.zsh | 1 + 1 file changed, 1 insertion(+) create mode 100644 source/history.zsh diff --git a/source/history.zsh b/source/history.zsh new file mode 100644 index 0000000..02107e1 --- /dev/null +++ b/source/history.zsh @@ -0,0 +1 @@ +bindkey '^r' history-incremental-search-backward From 815496d1eff379dfa55a7b471716209c1fc33361 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Sun, 24 Nov 2013 07:54:58 -0500 Subject: [PATCH 16/16] Add hub --- brew | 1 + source/git.zsh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/brew b/brew index 1a44ab1..a1fef86 100755 --- a/brew +++ b/brew @@ -36,6 +36,7 @@ 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 diff --git a/source/git.zsh b/source/git.zsh index abd4dc1..006f770 100644 --- a/source/git.zsh +++ b/source/git.zsh @@ -1 +1,4 @@ alias ghm='git push heroku master' + +# For "hub" http://hub.github.com/ +eval "$(hub alias -s)"