From 74052aa9eced3d05ec30f26dd31a7427ad875e79 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Mon, 16 Jul 2018 20:36:19 -0700
Subject: [PATCH] Move js-mode config out of org-mode

---
 emacs/.emacs.d/init/oni-js-mode-init.el  | 35 ++++++++++++++++++++++++
 emacs/.emacs.d/init/oni-js-mode-init.org | 16 -----------
 2 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 emacs/.emacs.d/init/oni-js-mode-init.el
 delete mode 100644 emacs/.emacs.d/init/oni-js-mode-init.org

diff --git a/emacs/.emacs.d/init/oni-js-mode-init.el b/emacs/.emacs.d/init/oni-js-mode-init.el
new file mode 100644
index 0000000..d7886ce
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-js-mode-init.el
@@ -0,0 +1,35 @@
+;;; oni-js-mode-init.el --- js-mode config           -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2018  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Configuration for `js-mode'.
+
+;;; Code:
+
+(require 'js)
+
+(setq js-enabled-frameworks '(javascript))
+
+(add-hook 'js-mode-hook 'electric-pair-local-mode)
+(add-hook 'js-mode-hook 'electric-indent-local-mode)
+
+(provide 'oni-js-mode-init)
+;;; oni-js-mode-init.el ends here
diff --git a/emacs/.emacs.d/init/oni-js-mode-init.org b/emacs/.emacs.d/init/oni-js-mode-init.org
deleted file mode 100644
index e28e84d..0000000
--- a/emacs/.emacs.d/init/oni-js-mode-init.org
+++ /dev/null
@@ -1,16 +0,0 @@
-#+TITLE: JavaScript mode
-
-I use js-mode for json files because js2-mode always complains about
-syntax errors.
-
-Turn on electric pairing for js-mode buffers.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'js-mode-hook 'electric-pair-local-mode)
-#+END_SRC
-
-Turn on electric indent mode for js-mode buffers.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'js-mode-hook 'electric-indent-local-mode)
-#+END_SRC