From 75da7531a5cd3d93b245bfd8c607169e4d98aae1 Mon Sep 17 00:00:00 2001
From: Gregory Eremin <magnolia_fan@me.com>
Date: Wed, 13 Mar 2013 12:51:31 +0400
Subject: [PATCH] Git aliases, submlime configs

---
 ruby/aprc            |  3 +--
 ruby/irbrc           |  2 +-
 sublime/config-dark  | 46 ++++++++++++++++++++++++++++++--------------
 sublime/config-light | 46 ++++++++++++++++++++++++++++++--------------
 zsh/zshrc            |  3 +++
 5 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/ruby/aprc b/ruby/aprc
index 0c1e171..cd52d4e 100644
--- a/ruby/aprc
+++ b/ruby/aprc
@@ -1,5 +1,4 @@
 AwesomePrint.defaults = {
   indent: -2,
-  index: false,
-  raw: true
+  index: false
 }
diff --git a/ruby/irbrc b/ruby/irbrc
index e4f41d3..7731831 100644
--- a/ruby/irbrc
+++ b/ruby/irbrc
@@ -4,6 +4,6 @@ require 'irb/ext/save-history'
 require 'rubygems'
 require 'ap'
 
-IRB.conf[:SAVE_HISTORY] = 100
+IRB.conf[:SAVE_HISTORY] = 10000
 IRB.conf[:AUTO_INDENT] = true
 AwesomePrint.irb!
diff --git a/sublime/config-dark b/sublime/config-dark
index fe26a46..2398e9b 100644
--- a/sublime/config-dark
+++ b/sublime/config-dark
@@ -1,21 +1,39 @@
 {
+  // Themes, Colors and Fonts
+  "theme": "Soda Dark.sublime-theme",
   "color_scheme": "Packages/Tomorrow Color Schemes/Tomorrow-Night.tmTheme",
-  "default_line_ending": "unix",
-  "drag_text": false,
-  "ensure_newline_at_eof_on_save": true,
-  "fallback_encoding": "Cyrillic (Windows 1251)",
   "font_face": "Source Code Pro",
-  "font_size": 14.0,
+  "font_size": 12.0,
+  "font_options": ["subpixel_antialias", "no_bold", "no_italic"],
+
+  // Behavior
+  "drag_text": false,
+  "highlight_modified_tabs": true,
+  "close_windows_when_empty": false,
+  "tree_animation_enabled": false,
+
+  // Text & Code
+  "fallback_encoding": "Cyrillic (Windows 1251)",
+  "default_line_ending": "unix",
+  "translate_tabs_to_spaces": true,
+  "ensure_newline_at_eof_on_save": true,
+  "trim_trailing_white_space_on_save": true,
+  "tab_size": 2,
+
+  // Editor
   "highlight_line": true,
-  "ignored_packages": ["Vintage"],
+  "rulers": [120],
   "line_padding_bottom": 1,
   "line_padding_top": 3,
-  "rulers": [120],
-  "tab_size": 2,
-  "theme": "Soda Dark.sublime-theme",
-  "translate_tabs_to_spaces": true,
-  "tree_animation_enabled": false,
-  "trim_trailing_white_space_on_save": true,
-  "folder_exclude_patterns": [".git", ".bundle", ".sass-cache"],
-  "file_exclude_patterns": [".DS_Store"]
+  "gutter": true,
+  "line_numbers": true,
+  "fold_buttons": false,
+  "draw_minimap_border": false,
+  "highlight_modified_tabs": true,
+  "close_windows_when_empty": false,
+
+  // Bullshit
+  "ignored_packages": ["Vintage"],
+  "file_exclude_patterns": [".DS_Store", "*.sublime-*"],
+  "folder_exclude_patterns": [".git", ".bundle", ".sass-cache"]
 }
diff --git a/sublime/config-light b/sublime/config-light
index 7702c6c..4e34f31 100644
--- a/sublime/config-light
+++ b/sublime/config-light
@@ -1,21 +1,39 @@
 {
+  // Themes, Colors and Fonts
+  "theme": "Soda Light.sublime-theme",
   "color_scheme": "Packages/Tomorrow Color Schemes/Tomorrow.tmTheme",
-  "default_line_ending": "unix",
-  "drag_text": false,
-  "ensure_newline_at_eof_on_save": true,
-  "fallback_encoding": "Cyrillic (Windows 1251)",
   "font_face": "Source Code Pro",
-  "font_size": 14.0,
+  "font_size": 12.0,
+  "font_options": ["subpixel_antialias", "no_bold", "no_italic"],
+
+  // Behavior
+  "drag_text": false,
+  "highlight_modified_tabs": true,
+  "close_windows_when_empty": false,
+  "tree_animation_enabled": false,
+
+  // Text & Code
+  "fallback_encoding": "Cyrillic (Windows 1251)",
+  "default_line_ending": "unix",
+  "translate_tabs_to_spaces": true,
+  "ensure_newline_at_eof_on_save": true,
+  "trim_trailing_white_space_on_save": true,
+  "tab_size": 2,
+
+  // Editor
   "highlight_line": true,
-  "ignored_packages": ["Vintage"],
+  "rulers": [120],
   "line_padding_bottom": 1,
   "line_padding_top": 3,
-  "rulers": [120],
-  "tab_size": 2,
-  "theme": "Soda Light.sublime-theme",
-  "translate_tabs_to_spaces": true,
-  "tree_animation_enabled": false,
-  "trim_trailing_white_space_on_save": true,
-  "folder_exclude_patterns": [".git", ".bundle", ".sass-cache"],
-  "file_exclude_patterns": [".DS_Store"]
+  "gutter": true,
+  "line_numbers": true,
+  "fold_buttons": false,
+  "draw_minimap_border": false,
+  "highlight_modified_tabs": true,
+  "close_windows_when_empty": false,
+
+  // Bullshit
+  "ignored_packages": ["Vintage"],
+  "file_exclude_patterns": [".DS_Store", "*.sublime-*"],
+  "folder_exclude_patterns": [".git", ".bundle", ".sass-cache"]
 }
diff --git a/zsh/zshrc b/zsh/zshrc
index 5ceba48..96f1e1a 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -20,3 +20,6 @@ compinit
 
 # load every completion after autocomplete loads
 # for config_file ($ZSH/**/completion.sh) source $config_file
+
+### Added by the Heroku Toolbelt
+export PATH="/usr/local/heroku/bin:$PATH"