emacs: tidy major modes

1 files changed, 25 insertions, 16 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index a32f3ab..8f3e1ee 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -75,22 +75,11 @@
                    (mapcar 'car smart-tabs-insinuate-alist))))
 (use-package editorconfig
   :config (editorconfig-mode 1))
-;; Major modes
+;; Major modes (non-HTML-related)
 (use-package bison-mode
   :mode (("\\.l\\'" . bison-mode)
          ("\\.y\\'" . bison-mode)
          ("\\.jison\\'" . jison-mode)))
-(use-package coffee-mode
-  :mode ("\\.coffee\\'"
-         "\\.iced\\'"
-         "\\Cakefile\\'"
-         "\\.cson\\'")
-  :interpreter "coffee"
-  :config (add-hook 'coffee-mode-hook
-                    '(lambda ()
-                       (set (make-local-variable 'tab-width) 2)
-                       (set (make-local-variable 'indent-tabs-mode) nil)
-                       )))
 (use-package cmake-mode        :mode ("CMakeLists\\.txt\\'" "\\.cmake\\'"))
 (use-package glsl-mode         :mode ("\\.vert\\'" "\\.frag\\'" "\\.geom\\'" "\\.glsl\\'"))
 (use-package go-mode           :mode "\\.go\\'")
@@ -100,7 +89,6 @@
                     '(lambda ()
                        (set (make-local-variable 'graphviz-dot-auto-indent-on-semi) nil)
                        )))
-(use-package haml-mode         :mode "\\.haml\\'")
 (use-package haskell-mode
   :mode (("\\.hcr\\'" . ghc-core-mode)
          ("\\.dump-simpl\\'" . ghc-core-mode)
@@ -110,17 +98,38 @@
          ("\\.[gh]s\\'" . haskell-mode)
          ("\\.l[gh]s\\'" . literate-haskell-mode)
          ("\\.hsc\\'" . haskell-mode))
-  :interpreter ("runghc" "runhaskell"))
-(use-package less-css-mode     :mode "\\.less\\'")
+  :interpreter ("runghc" "runhaskell")
+  :config (progn
+            (setq haskell-tags-on-save t)
+
+            ;(add-to-list 'load-path "/usr/share/ghc-mod/elisp")
+            ;(autoload 'ghc-init "ghc" nil t)
+            ;(autoload 'ghc-debug "ghc" nil t)
+            ;(add-hook 'haskell-mode-hook (lambda () (ghc-init))))
+  ))
 (use-package markdown-mode     :mode ("\\.markdown\\'" "\\.md\\'" "\\.ronn\\'"))
 (use-package nginx-mode        :mode ("nginx\\.conf\\'" "/nginx/.+\\.conf\\'"))
+(use-package yaml-mode         :mode "\\.\\(e?ya?\\|ra\\)ml\\'")
+;; Major modes (HTML-related)
+(use-package coffee-mode
+  :mode ("\\.coffee\\'"
+         "\\.iced\\'"
+         "\\Cakefile\\'"
+         "\\.cson\\'")
+  :interpreter "coffee"
+  :config (add-hook 'coffee-mode-hook
+                    '(lambda ()
+                       (set (make-local-variable 'tab-width) 2)
+                       (set (make-local-variable 'indent-tabs-mode) nil)
+                       )))
+(use-package haml-mode         :mode "\\.haml\\'")
+(use-package less-css-mode     :mode "\\.less\\'")
 (use-package php-mode
   :mode ("\\.php[s345t]?\\'" "/\\.php_cs\\(\\.dist\\)?\\'" "\\.phtml\\'" "/Amkfile\\'" "\\.amk\\'")
   :interpreter "php\\(?:-?[3457]\\(?:\\.[0-9]+\\)*\\)?")
 (use-package scss-mode         :mode "\\.scss\\'")
 (use-package typescript-mode   :mode "\\.ts\\'")
 (use-package vue-mode          :mode "\\.vue\\'")
-(use-package yaml-mode         :mode "\\.\\(e?ya?\\|ra\\)ml\\'")
 
 ;;(use-package nxhtml) ; nxhtml is invasive, only enable if actively using