lots of install/brew/node cleanup

aliases

@@ -44,7 +44,6 @@ alias gst="git status"
 alias ggpl='git pull origin $(current_branch)'
 alias ggps='git push origin $(current_branch)'
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
-alias gitrm='git rm $(git ls-files --deleted)'
 alias gsmu='git submodule init && git submodule update'
 alias gsmuu='git submodule foreach git pull origin master'
 alias gsvn='git checkout master && git svn fetch && git merge dev && git svn rebase && git svn dcommit'
@@ -56,8 +55,8 @@ alias apachestart='sudo apachectl start'
 alias apachestop='sudo apachectl stop'
 alias mysqlstart='mysql.server start'
 alias mysqlstop='mysql.server stop'
-alias dev='apachestart && mysqlstart && npm_lazy &'
-alias devs='apachestop && mysqlstop && grepkill npm_lazy'
+alias dev='apachestart && mysqlstart'
+alias devs='apachestop && mysqlstop'
 alias devr='devs && dev'
 
 
@@ -83,8 +82,7 @@ alias upall='sysup && brewup && gemup && npmup'
 # easy hosts / apache / php editing
 alias hosts='sudo vim /etc/hosts'
 alias vhosts='sudo vim /usr/local/etc/apache2/extra/httpd-vhosts.conf'
-alias php55ini='vim /usr/local/etc/php/5.5/php.ini'
-alias php54ini='vim /usr/local/etc/php/5.4/php.ini'
+alias phpini='vim /usr/local/etc/php/5.5/php.ini'
 alias http='vim /usr/local/etc/apache2/httpd.conf'
 
 

gitconfig

@@ -38,6 +38,7 @@
   rbc = rebase --continue
   ffs = flow feature start
   fff = flow feature finish
+  ffp = flow feature publish
   fi = flow init
   unst = reset HEAD
   hub = push origin master

install/_install.sh

@@ -17,15 +17,19 @@ export HOMEBREW_CASK_OPTS="--appdir=/Applications"
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 
 # install some neccessary brew packages
-brew install tmux
-brew install zsh
-brew install git
 brew install brew-cask
 brew install coreutils
+brew install git
+brew install macvim --with-cscope --with-lua --HEAD
+brew install reattach-to-user-namespace
+brew install tmux
+brew install the_silver_searcher
+brew install wget
+brew install zsh
 
-brew cask install forklift
-brew cask install iterm2-beta
 brew cask install dropbox
+brew cask install forklift
+brew cask install iterm2
 
 # set zsh to the default
 sudo vim /etc/shells

install/brew.sh

@@ -4,17 +4,16 @@ brew tap homebrew/dupes
 brew tap josegonzalez/homebrew-php
 brew tap thoughtbot/formulae
 
-# install brew packages
+# install additional brew packages -- see _install.sh too
 brew install curl
+brew install ffmpeg
 brew install ghostscript
 brew install git-flow
-brew install gitsh
 brew install httpd
 brew install imagemagick
-brew install macvim --with-cscope --with-lua --HEAD
+brew install markdown
 brew install mysql
 brew install node --without-npm
-brew install reattach-to-user-namespace
 brew install php55
 brew install php55-mcrypt
 brew install php55-xdebug
@@ -24,32 +23,36 @@ brew install rbenv
 brew install ruby-build
 brew install ssh-copy-id
 brew install subversion
-brew install the_silver_searcher
-brew install wget
+brew install unrar
 brew install youtube-dl
-brew install z
 
 # brew cask and install software
 brew cask install adium
 brew cask install alfred
 brew cask install amadeus-pro
 brew cask install bartender
+brew cask install betterzipql
+brew cask install bill
 brew cask install carbon-copy-cloner
 brew cask install doxie
-brew cask install dropbox
 brew cask install firefox
+brew cask install flux
 brew cask install fontprep
-brew cask install f-lux
 brew cask install ghostlab
 brew cask install google-chrome
 brew cask install google-chrome-canary
 brew cask install imagealpha
 brew cask install imageoptim
 brew cask install istat-menus
-brew cask install keyremap4macbook
+brew cask install karabiner
 brew cask install libreoffice
 brew cask install miro-video-converter
-brew cask install pckeyboardhack
+brew cask install qlcolorcode
+brew cask install qlmarkdown
+brew cask install qlstephen
+brew cask install quicklook-csv
+brew cask install quicklook-json
+brew cask install seil
 brew cask install sequel-pro
 brew cask install skype
 brew cask install slate
@@ -62,14 +65,6 @@ brew cask install vlc
 brew cask install wedge
 brew cask install xld
 
-# quicklook stuff
-brew cask install qlcolorcode
-brew cask install qlstephen
-brew cask install qlmarkdown
-brew cask install quicklook-json
-brew cask install quicklook-csv
-brew cask install betterzipql
-
 # set some options for qlcolorcode
 defaults write org.n8gray.QLColorCode font Menlo
 defaults write org.n8gray.QLColorCode fontSizePoints 8

install/node.sh

@@ -7,24 +7,13 @@ brew unlink node
 brew link node
 curl https://npmjs.org/install.sh | sh
 
-# set npm to use npm_lazy
-npm install -g npm_lazy
-npm config set registry http://localhost:8080/
-
 npm install -g bower
 npm install -g browserify
 npm install -g dploy
-npm install -g fuck-you
-npm install -g generator-generator
 npm install -g grunt-cli
 npm install -g gulp
-npm install -g jake
-npm install -g js-beautify
 npm install -g jshint
 npm install -g jsonlint
 npm install -g npm-check-updates
 npm install -g recursive-blame
 npm install -g stylestats
-npm install -g svgo
-npm install -g uglify-js
-npm install -g yo

install/ruby.sh

@@ -2,7 +2,6 @@
 
 gem install bundler --no-ri --no-rdoc
 gem install sass --no-ri --no-rdoc
-gem install sass-globbing --no-ri --no-rdoc
 gem install capistrano --no-ri --no-rdoc
 gem install compass --pre --no-ri --no-rdoc
 gem install scss-lint --no-ri --no-rdoc