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 +++--
 settings/setup-clojure-mode.el | 3 ---
 settings/setup-web-mode.el     | 1 +
 settings/setup-yaml-mode.el    | 7 +++++++
 4 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 settings/setup-yaml-mode.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)
diff --git a/settings/setup-clojure-mode.el b/settings/setup-clojure-mode.el
index 2c2e9b3..109b074 100644
--- a/settings/setup-clojure-mode.el
+++ b/settings/setup-clojure-mode.el
@@ -5,7 +5,4 @@
 (add-hook 'clojure-mode-hook 'enable-paredit-mode)
 (add-hook 'clojure-mode-hook 'prettify-symbols-mode)
 
-;; This should be in it's own setup file
-(add-to-list 'auto-mode-alist '("\\.el\\'" . paredit-mode))
-
 (provide 'setup-clojure-mode)
diff --git a/settings/setup-web-mode.el b/settings/setup-web-mode.el
index b3893cf..5491d6a 100644
--- a/settings/setup-web-mode.el
+++ b/settings/setup-web-mode.el
@@ -3,6 +3,7 @@
 
 (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode))
+(add-to-list 'auto-mode-alist '("\\.js\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode))
 (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode))
diff --git a/settings/setup-yaml-mode.el b/settings/setup-yaml-mode.el
new file mode 100644
index 0000000..f4e8a71
--- /dev/null
+++ b/settings/setup-yaml-mode.el
@@ -0,0 +1,7 @@
+(require 'yaml-mode)
+
+(add-hook 'yaml-mode-hook
+	  (lambda ()
+	    (define-key yaml-mode-map "\C-m" 'newline-and-indent)))
+
+(provide 'setup-yaml-mode)
-- 
cgit v1.2.3