emacs: consolidate configuration for conf-mode

4 files changed, 12 insertions, 19 deletions

diff --git a/emacs.d/custom/fcuny-json.el b/emacs.d/custom/fcuny-conf.el
index 8ca09dd..e97d055 100644
--- a/emacs.d/custom/fcuny-json.el
+++ b/emacs.d/custom/fcuny-conf.el
@@ -1,7 +1,11 @@
-(require 'fcuny-defuns)
+(use-package dockerfile-mode
+  :ensure t
+  :mode "Dockerfile[a-zA-Z.-]*\\'")
+
+(use-package yaml-mode
+  :ensure t)
 
 (use-package js-mode
-  :after (flyspell flycheck)
   :custom
   (json-reformat:indent-width 2)
   (js-indent-level 2)
@@ -14,4 +18,9 @@
 (use-package jq-format
   :ensure t)
 
-(provide 'fcuny-json)
+(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-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)