Skip to content

Commit

Permalink
git hook template, more casks and npm globals
Browse files Browse the repository at this point in the history
  • Loading branch information
atomantic committed Jul 29, 2014
1 parent 7e26f3d commit fe65ae6
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 4 deletions.
7 changes: 7 additions & 0 deletions .git_template/hooks/post-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env ruby
file="~/.gitshots/#{Time.now.to_i}.jpg"
unless File.directory?(File.expand_path("../../rebase-merge", __FILE__))
puts "Taking capture into #{file}!"
system "imagesnap -q -w 3 #{file} &"
end
exit 0
2 changes: 1 addition & 1 deletion .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
#tool = myaraxis
tool = diffmerge
[init]
templatedir = /usr/local/git/share/git-core/templates/hooks/
templatedir = ~/.dotfiles/.git_template
[mergetool]
prompt = false
keepBackup = false
Expand Down
19 changes: 19 additions & 0 deletions .osx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null &
# always boot in verbose mode (not OSX GUI mode)
sudo nvram boot-args="-v";

# allow 'locate' command
sudo launchctl load -w /System/Library/LaunchDaemons/com.apple.locate.plist

# Set standby delay to 24 hours (default is 1 hour)
sudo pmset -a standbydelay 86400

Expand Down Expand Up @@ -664,6 +667,22 @@ defaults write com.irradiatedsoftware.SizeUp ShowPrefsOnNextStart -bool false
# Install Sublime Text settings
cp -r init/Preferences.sublime-settings ~/Library/Application\ Support/Sublime\ Text*/Packages/User/Preferences.sublime-settings 2> /dev/null

###############################################################################
# NPM GLOBALS #
###############################################################################
npm install -g bower
npm install -g coffee-script
npm install -g forever
npm install -g gulp
npm install -g js-complexity-viz
npm install -g jshint
npm install -g meteorite
npm install -g prettyjson
npm install -g repl-client
npm install -g replify
npm install -g supervisor
npm install -g yo

###############################################################################
# Kill affected applications #
###############################################################################
Expand Down
1 change: 1 addition & 0 deletions BrewFile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ install node
install dos2unix
install ack
install nmap
install gnupg

# Remove outdated versions from the cellar
cleanup
14 changes: 11 additions & 3 deletions CaskFile
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,29 @@
install caskroom/cask/brew-cask
tap caskroom/versions

# tools
# cloud storage
cask install amazon-cloud-drive 2> /dev/null
cask install box-sync 2> /dev/null
cask install diffmerge 2> /dev/null
cask install dropbox 2> /dev/null
cask install skydrive 2> /dev/null

# tools
cask install adium 2> /dev/null
cask install diffmerge 2> /dev/null
cask install evernote 2> /dev/null
cask install flash-player 2> /dev/null
cask install github 2> /dev/null
cask install gpgtools 2> /dev/null
cask install lastpass-universal 2> /dev/null
cask install macvim 2> /dev/null
cask install sizeup 2> /dev/null
cask install skydrive 2> /dev/null
cask install slack 2> /dev/null
cask install sublime-text 2> /dev/null
cask install the-unarchiver 2> /dev/null
cask install total-terminal 2> /dev/null
cask install transmission 2> /dev/null
cask install vlc 2> /dev/null
cask install xquartz 2> /dev/null

# development browsers
cask install breach 2> /dev/null
Expand Down

0 comments on commit fe65ae6

Please sign in to comment.