Merge branch 'master' of github.com:codegram/dotfiles

bin/check_json

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'json'
+
+p JSON.parse(File.read(ARGV[0]))

bin/rb

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+$MY_RUBY_HOME/bin/ruby $@

jslintrc

@@ -1,3 +1,3 @@
-/*jslint white: true, onevar: true, undef: true, nomen: true, regexp: true, plusplus: true, bitwise: true, node: true, maxerr: 50, indent: 2 */
-/*global jQuery, $, module, require, GLOBAL, __dirname, console, Buffer, process, exports, JSON */
+/*jslint white: true, onevar: true, undef: true, nomen: false, regexp: true, plusplus: true, bitwise: true, devel: true, node: true, maxerr: 50, indent: 2 */
+/*global jQuery, $, _, Backbone, window, module, require, GLOBAL, console, Buffer, process, exports, JSON */
 /* vim: set ft=javascript: */

zsh/aliases

@@ -40,6 +40,7 @@ alias b="bundle"
 alias be="bundle exec"
 alias bi="bundle install"
 alias bu="bundle update"
+alias git=hub
 
 # Rails console
 alias sc="pry --simple-prompt -r config/environment"

zsh/env

@@ -1,5 +1,5 @@
 # Enviroment Variables
-export EDITOR="vi"
+export EDITOR="vim"
 export LC_CTYPE=en_US.UTF-8
 export LANG=en_US.UTF-8
 export TERM=xterm-256color