From 0e412e54873b6dd494921855dd93c3a56d56b260 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck.cuny@gmail.com>
Date: Sun, 15 Mar 2020 19:16:51 -0700
Subject: emacs: consolidate configuration for conf-mode

---
 emacs.d/custom/fcuny-conf.el     | 26 ++++++++++++++++++++++++++
 emacs.d/custom/fcuny-docker.el   |  5 -----
 emacs.d/custom/fcuny-json.el     | 17 -----------------
 emacs.d/custom/fcuny-protobuf.el |  7 -------
 emacs.d/custom/fcuny-yaml.el     |  4 ----
 5 files changed, 26 insertions(+), 33 deletions(-)
 create mode 100644 emacs.d/custom/fcuny-conf.el
 delete mode 100644 emacs.d/custom/fcuny-docker.el
 delete mode 100644 emacs.d/custom/fcuny-json.el
 delete mode 100644 emacs.d/custom/fcuny-protobuf.el
 delete mode 100644 emacs.d/custom/fcuny-yaml.el

diff --git a/emacs.d/custom/fcuny-conf.el b/emacs.d/custom/fcuny-conf.el
new file mode 100644
index 0000000..e97d055
--- /dev/null
+++ b/emacs.d/custom/fcuny-conf.el
@@ -0,0 +1,26 @@
+(use-package dockerfile-mode
+  :ensure t
+  :mode "Dockerfile[a-zA-Z.-]*\\'")
+
+(use-package yaml-mode
+  :ensure t)
+
+(use-package js-mode
+  :custom
+  (json-reformat:indent-width 2)
+  (js-indent-level 2)
+  :hook ((json-mode . flyspell-prog-mode)
+         (json-mode . flycheck-mode))
+  :init
+  (if (fcuny/check-work-machine-p)
+    (add-to-list 'auto-mode-alist '("\\.workflow$" . js-mode))))
+
+(use-package jq-format
+  :ensure t)
+
+(use-package protobuf-mode
+  :ensure t
+  :hook ((protobuf-mode . flyspell-prog-mode)
+         (protobuf-mode . flycheck-mode)))
+
+(provide 'fcuny-conf)
diff --git a/emacs.d/custom/fcuny-docker.el b/emacs.d/custom/fcuny-docker.el
deleted file mode 100644
index be31098..0000000
--- a/emacs.d/custom/fcuny-docker.el
+++ /dev/null
@@ -1,5 +0,0 @@
-(use-package dockerfile-mode
-  :ensure t
-  :mode "Dockerfile[a-zA-Z.-]*\\'")
-
-(provide 'fcuny-docker)
diff --git a/emacs.d/custom/fcuny-json.el b/emacs.d/custom/fcuny-json.el
deleted file mode 100644
index 8ca09dd..0000000
--- a/emacs.d/custom/fcuny-json.el
+++ /dev/null
@@ -1,17 +0,0 @@
-(require 'fcuny-defuns)
-
-(use-package js-mode
-  :after (flyspell flycheck)
-  :custom
-  (json-reformat:indent-width 2)
-  (js-indent-level 2)
-  :hook ((json-mode . flyspell-prog-mode)
-         (json-mode . flycheck-mode))
-  :init
-  (if (fcuny/check-work-machine-p)
-    (add-to-list 'auto-mode-alist '("\\.workflow$" . js-mode))))
-
-(use-package jq-format
-  :ensure t)
-
-(provide 'fcuny-json)
diff --git a/emacs.d/custom/fcuny-protobuf.el b/emacs.d/custom/fcuny-protobuf.el
deleted file mode 100644
index c344684..0000000
--- a/emacs.d/custom/fcuny-protobuf.el
+++ /dev/null
@@ -1,7 +0,0 @@
-(use-package protobuf-mode
-  :after (flyspell flycheck)
-  :ensure t
-  :hook ((protobuf-mode . flyspell-prog-mode)
-         (protobuf-mode . flycheck-mode)))
-
-(provide 'fcuny-protobuf)
diff --git a/emacs.d/custom/fcuny-yaml.el b/emacs.d/custom/fcuny-yaml.el
deleted file mode 100644
index b84c041..0000000
--- a/emacs.d/custom/fcuny-yaml.el
+++ /dev/null
@@ -1,4 +0,0 @@
-(use-package yaml-mode
-  :ensure t)
-
-(provide 'fcuny-yaml)
-- 
cgit 1.4.1