woot

install/_install.sh

@@ -44,6 +44,7 @@ git submodule update
 ln -s ~/dotfiles/agignore ~/.agignore
 ln -s ~/dotfiles/editorconfig ~/.editorconfig
 ln -s ~/dotfiles/eslintrc ~/.eslintrc
+ln -s ~/dotfiles/gemrc ~/.gemrc
 ln -s ~/dotfiles/gitconfig ~/.gitconfig
 ln -s ~/dotfiles/gitignore ~/.gitignore
 ln -s ~/dotfiles/slate.js ~/.slate.js

install/brew.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 brew tap homebrew/dupes
 brew tap homebrew/php
 
@@ -9,6 +8,7 @@ brew install composer
 brew install curl
 brew install docker
 brew install fasd
+brew install ffmpeg --with-libvpx --with-libvorbis --with-fdk-aac
 brew install git-extras
 brew install git-flow
 brew install httpd
@@ -16,7 +16,9 @@ brew install imagemagick
 brew install markdown
 brew install mysql
 brew install php56
+brew install php56-intl
 brew install php56-mcrypt
+brew install php56-tidy
 brew install php56-xdebug
 brew install rbenv
 brew install ruby-build
@@ -51,7 +53,6 @@ brew cask install quicklook-json
 brew cask install seil
 brew cask install sequel-pro
 brew cask install slate
-brew cask install things
 brew cask install transmission
 brew cask install virtualbox
 brew cask install vlc

install/node.sh

@@ -7,6 +7,7 @@ brew unlink node
 brew link node
 curl -L https://npmjs.org/install.sh | sh
 
+npm install -g caniuse-cmd
 npm install -g dploy
 npm install -g eslint
 npm install -g frontend-md

vim/config/bundles.vim

@@ -1,34 +1,38 @@
 " All bundles, syntaxes and plugins
 "======================================================================
+"
+NeoBundle 'Shougo/vimproc.vim', {
+    \ 'build': {
+    \     'mac': 'make -f make_mac.mak',
+    \     'linux': 'make',
+    \     'unix': 'gmake'
+    \    }
+    \ }
 
 NeoBundle 'Shougo/neocomplete'
 NeoBundle 'Shougo/neosnippet'
 NeoBundle 'Shougo/unite.vim'
-NeoBundle 'Shougo/vimproc.vim', {
-      \ 'build': {
-      \     'mac': 'make -f make_mac.mak',
-      \     'linux': 'make',
-      \     'unix': 'gmake'
-      \    }
-      \ }
-
 NeoBundle 'altercation/vim-colors-solarized'
 NeoBundle 'beyondwords/vim-twig'
 NeoBundle 'cakebaker/scss-syntax.vim'
 NeoBundle 'christoomey/vim-tmux-navigator'
+NeoBundle 'cohama/lexima.vim'
 NeoBundle 'editorconfig/editorconfig-vim'
 NeoBundle 'elzr/vim-json'
 NeoBundle 'gcmt/wildfire.vim'
 NeoBundle 'godlygeek/tabular'
+NeoBundle 'gregsexton/gitv'
 NeoBundle 'hail2u/vim-css3-syntax'
 NeoBundle 'haya14busa/incsearch.vim'
 NeoBundle 'itchyny/lightline.vim'
 NeoBundle 'joshtronic/php.vim'
 NeoBundle 'justinmk/vim-sneak'
+NeoBundle 'marijnh/tern_for_vim'
 NeoBundle 'moll/vim-node'
 NeoBundle 'othree/html5.vim'
 NeoBundle 'othree/javascript-libraries-syntax.vim'
 NeoBundle 'othree/yajs.vim'
+NeoBundle 'reedes/vim-pencil'
 NeoBundle 'scrooloose/syntastic'
 NeoBundle 'tomtom/tcomment_vim'
 NeoBundle 'tpope/vim-fugitive'

vim/config/plugins/pencil.vim

@@ -0,0 +1,6 @@
+augroup pencil
+  autocmd!
+  autocmd FileType markdown call pencil#init()
+  autocmd FileType textile call pencil#init()
+  autocmd FileType text call pencil#init({'wrap': 'hard'})
+augroup END

vimrc

@@ -29,6 +29,7 @@ source ~/.vim/config/plugins/incsearch.vim
 source ~/.vim/config/plugins/lightline.vim
 source ~/.vim/config/plugins/neocomplete.vim
 source ~/.vim/config/plugins/neosnippet.vim
+source ~/.vim/config/plugins/pencil.vim
 source ~/.vim/config/plugins/syntastic.vim
 source ~/.vim/config/plugins/tabularize.vim
 source ~/.vim/config/plugins/tcomment.vim

zsh/aliases

@@ -67,7 +67,7 @@ alias t='tmux -u -2'
 alias ta='tmux attach'
 
 # all in one homebrew, gem update commands
-alias brewup='brew update && brew upgrade && brew cleanup && brew linkapps'
+alias brewup='brew update && brew upgrade --all && brew cleanup && brew linkapps'
 alias gemup='gem update --system && gem update && gem cleanup'
 alias npmup='npm -g cache clean && npm -g update'
 alias sysup='sudo softwareupdate -i -a'

zsh/functions

@@ -17,6 +17,7 @@ function tmd() {
   tmux send-keys -t gitngulp 'gulp' Enter
 }
 
+# generate screenshots from url
 function screenshot() {
   cd ~/Downloads/
   pageres $1 320x500 --filename '<%= url %>-mobile' --crop --delay 3
@@ -24,15 +25,13 @@ function screenshot() {
   pageres $1 1400x1000 --filename '<%= url %>-desktop' --crop --delay 3
 }
 
-# open man pages in vim -- use vim-superman-plugin
-vman() {
-  vim -c "SuperMan $*"
-
-  if [ "$?" != "0" ]; then
-    echo "No manual entry for $*"
-  fi
+# convert a video to mp4 + webm in one go for web
+function videoconvert() {
+  ffmpeg -i $1 -acodec libvorbis -aq 7 -ac 2 -vcodec libvpx -b:v 2M -qmax 16 -threads 4 $1.webm
+  ffmpeg -i $1 -acodec libfdk_aac -cutoff 18000 -vcodec libx264 -b:v 2M -qmax 16 -threads 4 $1.mp4
 }
 
+
 # a small function for finding stuff
 function fname() {
   find . -iname "*$@*";
@@ -57,13 +56,6 @@ function gch () {
 }
 
 
-function current_branch() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
-  echo ${ref#refs/heads/}
-}
-
-
 # creates an archive from given directory
 mktar() { tar cvf  "${1%%/}.tar" "${1%%/}"; }
 mktgz() { tar cvzf "${1%%/}.tgz" "${1%%/}"; }