# HG changeset patch
# User Luke Hoersten <luke@hoersten.org>
# Date 1487892187 21600
# Node ID f7640b0bab679f16f331e01ec8ba5f63c49a819c
# Parent  8458091b7533cd1ba83eda29468ae784b573b7ec
Removed marmalade and rainbow-mode. Added ag package. Defaulted to Inconsolata on all OSs.

diff -r 8458091b7533 -r f7640b0bab67 elisp/package-require.el
--- a/elisp/package-require.el	Wed Feb 22 12:13:38 2017 -0600
+++ b/elisp/package-require.el	Thu Feb 23 17:23:07 2017 -0600
@@ -3,8 +3,6 @@
 
 (require 'package)
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
-;; (add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t)
-(add-to-list 'package-archives '("marmalade" . "https://marmalade-repo.org/packages/") t)
 
 (package-initialize)
 (package-refresh-contents)
diff -r 8458091b7533 -r f7640b0bab67 init.el
--- a/init.el	Wed Feb 22 12:13:38 2017 -0600
+++ b/init.el	Thu Feb 23 17:23:07 2017 -0600
@@ -56,15 +56,15 @@
   (tool-bar-mode -1)                          ; remove tool bar
   (scroll-bar-mode -1)                        ; remove scroll bar
   (unless is-mac (menu-bar-mode -1))          ; remove menu bar
-  (set-frame-font (if is-mac "Inconsolata-12" "Ubuntu Mono-10.5") nil t))
+  (set-frame-font "Inconsolata-12" nil t))
 
 
 ;;;; Packages ;;;;
 (package-initialize)
 (require 'package-require)
-(package-require '(company exec-path-from-shell expand-region flx-ido
+(package-require '(ag company exec-path-from-shell expand-region flx-ido
  smex markdown-mode markdown-mode+ hgignore-mode move-text paredit
- rainbow-delimiters rainbow-mode json-mode json-reformat flycheck
+ rainbow-delimiters json-mode json-reformat flycheck
  solarized-theme terraform-mode visual-regexp yasnippet yaml-mode
  zencoding-mode))
 
@@ -217,7 +217,6 @@
  (lambda (x)
    (add-hook x
     (lambda ()
-      (rainbow-mode t)
       (linum-mode t)
       (rainbow-delimiters-mode t))))
  '(text-mode-hook