node install stuff and minor changes

aliases

@@ -51,10 +51,6 @@ alias sysup='_ softwareupdate -i -a'
 alias upall='sysup && brewup && rvmup && gemup && npmup'
 
 
-# alias for re-installing npm from the web and default packages
-alias npmins='brew link --overwrite node && curl https://npmjs.org/install.sh | sh && npm install -g grunt-cli && npm install -g jshint && npm install -g uglify-js && npm install -g jake'
-
-
 # always use macvim but for 'vim'
 alias vim=$EDITOR
 alias vi=$EDITOR

brew.sh

@@ -47,6 +47,7 @@ brew cask install charles
 brew cask install doxie
 brew cask install dropbox
 brew cask install firefox
+brew cask install f-lux
 brew cask install forklift
 brew cask install google-chrome
 brew cask install handbrake

node.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env zsh
+
+brew update
+brew upgrade node
+brew link --overwrite node
+npm install -g grunt-cli
+npm install -g jshint
+npm install -g uglify-js
+npm install -g jake
+npm install -g jsonlint
+npm install -g recursive-blame
+npm install -g bower
+npm install -g yo
+npm install -g generator-generator

osx.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
 
 # Disable menu bar transparency
 defaults write NSGlobalDomain AppleEnableMenuBarTransparency -bool false

vim/snippets/html.snippets

@@ -100,6 +100,7 @@ endsnippet
 
 snippet btn "HTML button"
 <button id="${1:someid}" class="${2:btn}">${3:Senden}</button>$0
+endsnippet
 
 snippet fset "Fieldset"
 <fieldset class="${1:class}"}>

vimrc

@@ -22,6 +22,7 @@ Bundle 'edsono/vim-matchit'
 Bundle 'ervandew/supertab'
 Bundle 'godlygeek/tabular'
 Bundle 'kien/ctrlp.vim'
+Bundle 'leshill/vim-json'
 Bundle 'mattn/gist-vim'
 Bundle 'mattn/webapi-vim'
 Bundle 'rizzatti/dash.vim'