From a0ee7a0a5ce8f0574a7c0f127bf70f2d214caecf Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 29 Jan 2016 07:02:53 -0500
Subject: [PATCH] Move {yaml,json,toml,vimrc}-mode to core-editor

---
 core/core-editor.el    |  8 ++++++++
 modules/module-data.el | 12 ------------
 modules/module-vim.el  |  7 -------
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 modules/module-data.el
 delete mode 100644 modules/module-vim.el

diff --git a/core/core-editor.el b/core/core-editor.el
index 20ec11f66..de037280b 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -109,6 +109,14 @@ enable multiple minor modes for the same regexp.")
 (add-hook! after-init
   (setq winner-boring-buffers narf-ignore-buffers))
 
+;; Extra modes ;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(use-package vimrc-mode :mode ("/\\.?g?vimrc$" "\\.vim$" "/\\.vim/rc/.+$"))
+
+;; Data formats
+(use-package yaml-mode :mode "\\.ya?ml$")
+(use-package toml-mode :mode "\\.toml$")
+(use-package json-mode :mode "\\.js\\(on\\|hintrc\\)$")
 
 ;; Plugins ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
diff --git a/modules/module-data.el b/modules/module-data.el
deleted file mode 100644
index 1b224ce76..000000000
--- a/modules/module-data.el
+++ /dev/null
@@ -1,12 +0,0 @@
-;;; module-data.el --- dbs 'n data formats
-
-(use-package yaml-mode :mode "\\.ya?ml$")
-
-(use-package json-mode :mode "\\.js\\(on\\|hintrc\\)$")
-
-(use-package toml-mode :mode "\\.toml$")
-
-;; TODO: Db client
-
-(provide 'module-data)
-;;; module-data.el ends here
diff --git a/modules/module-vim.el b/modules/module-vim.el
deleted file mode 100644
index 021983cdf..000000000
--- a/modules/module-vim.el
+++ /dev/null
@@ -1,7 +0,0 @@
-;;; module-vim.el
-
-(use-package vimrc-mode
-  :mode ("/\\.?g?vimrc$" "\\.vim$" "/\\.vim/rc/.+$"))
-
-(provide 'module-vim)
-;;; module-vim.el ends here