From f6ba59fca119f4decbb28818906fd063b3621413 Mon Sep 17 00:00:00 2001
From: benj <benj@rse8.com>
Date: Fri, 11 Nov 2016 23:21:51 -0800
Subject: added magit and removed js2 in favor of web-mode

---
 init.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index a426f5a..4bb05d2 100644
--- a/init.el
+++ b/init.el
@@ -34,7 +34,6 @@
      haskell-mode
      highlight-escape-sequences
      ido-vertical-mode
-     js2-mode
      magit
      markdown-mode
      multiple-cursors
@@ -43,6 +42,7 @@
      scala-mode
      visual-regexp
      web-mode
+     yaml-mode
      yasnippet)))
 
 (condition-case nil
@@ -65,11 +65,12 @@
 (require 'setup-flycheck)
 (require 'setup-haskell-mode)
 (require 'setup-ido)
-(require 'setup-js-mode)
+(require 'setup-magit)
 (require 'setup-markdown-mode)
 (require 'setup-multiple-cursors)
 (require 'setup-scala-mode)
 (require 'setup-web-mode)
+(require 'setup-yaml-mode)
 (require 'setup-yasnippet)
 
 (require 'visual-regexp)
-- 
cgit v1.2.3


From f6c366f20c756c6f069e5c60bc9003189d31edbe Mon Sep 17 00:00:00 2001
From: benj <benj@rse8.com>
Date: Sun, 13 Nov 2016 13:28:38 -0800
Subject: custom org mode and some ido clean up

---
 init.el | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 4bb05d2..113ed36 100644
--- a/init.el
+++ b/init.el
@@ -38,6 +38,7 @@
      markdown-mode
      multiple-cursors
      paredit
+     org-bullets
      sbt-mode
      scala-mode
      visual-regexp
@@ -68,6 +69,7 @@
 (require 'setup-magit)
 (require 'setup-markdown-mode)
 (require 'setup-multiple-cursors)
+(require 'setup-org-mode)
 (require 'setup-scala-mode)
 (require 'setup-web-mode)
 (require 'setup-yaml-mode)
-- 
cgit v1.2.3


From 53853e36fa71b0c2d79d3593ebddd70b9be3b26b Mon Sep 17 00:00:00 2001
From: benj <benj@rse8.com>
Date: Thu, 19 Jan 2017 21:34:25 -0800
Subject: added a bunch of stuff including purescript support

---
 init.el | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 113ed36..4071c48 100644
--- a/init.el
+++ b/init.el
@@ -1,4 +1,11 @@
 ;; Suppress splash screen
+
+;; Added by Package.el.  This must come before configurations of
+;; installed packages.  Don't delete this line.  If you don't want it,
+;; just comment it out by adding a semicolon to the start of the line.
+;; You may delete these explanatory comments.
+(package-initialize)
+
 (setq inhibit-startup-message t)
 
 (setq settings-dir
@@ -25,6 +32,7 @@
      clojure-mode-extra-font-locking
      clojure-snippets
      dash
+     elm-mode
      ember-mode
      ensime
      flycheck
@@ -38,6 +46,8 @@
      markdown-mode
      multiple-cursors
      paredit
+     play-routes-mode
+     purescript-mode
      org-bullets
      sbt-mode
      scala-mode
@@ -70,6 +80,7 @@
 (require 'setup-markdown-mode)
 (require 'setup-multiple-cursors)
 (require 'setup-org-mode)
+(require 'setup-purescript-mode)
 (require 'setup-scala-mode)
 (require 'setup-web-mode)
 (require 'setup-yaml-mode)
-- 
cgit v1.2.3