emacs: clean up use-package, add haskell-mode

2 files changed, 26 insertions, 11 deletions

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index 5412572..6da4ae8 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -35,7 +35,7 @@
  '(org-src-fontify-natively t)
  '(package-selected-packages
    (quote
-    (php-mode less-css-mode yaml-mode smart-tabs-mode scss-mode sass-mode page-break-lines nginx-mode mediawiki markdown-mode jabber graphviz-dot-mode gradle-mode go-mode glsl-mode editorconfig dtrt-indent coffee-mode cmake-mode bison-mode)))
+    (haml-mode haskell-mode csharp-mode php-mode less-css-mode yaml-mode smart-tabs-mode scss-mode sass-mode page-break-lines nginx-mode mediawiki markdown-mode jabber graphviz-dot-mode gradle-mode go-mode glsl-mode editorconfig dtrt-indent coffee-mode cmake-mode bison-mode)))
  '(ruby-deep-arglist nil)
  '(ruby-deep-indent-paren nil)
  '(safe-local-variable-values
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 200daad..20ac4d8 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -90,28 +90,43 @@
                        (set (make-local-variable 'tab-width) 2)
                        (set (make-local-variable 'indent-tabs-mode) nil)
                        )))
-;;(use-package php-mode-improved
-;;  :mode (("\\.php[s34]?\\'" . php-mode)
-;;         ("\\.phtml\\'" . php-mode)
-;;         ("\\.inc\\'" . php-mode))
-;;  :config (add-hook 'php-mode-hook
-;;                    '(lambda ()
-;;                       (c-set-offset 'cpp-macro 0)
-;;                       )))
 (use-package cmake-mode        :mode ("CMakeLists\\.txt\\'" "\\.cmake\\'"))
 (use-package glsl-mode         :mode ("\\.vert\\'" "\\.frag\\'" "\\.geom\\'" "\\.glsl\\'"))
 (use-package go-mode           :mode "\\.go\\'")
 (use-package graphviz-dot-mode :mode ("\\.dot\\'" "\\.gv\\'"))
 (use-package haml-mode         :mode "\\.haml\\'")
+(use-package haskell-mode
+  :mode (("\\.hcr\\'" . ghc-core-mode)
+         ("\\.dump-simpl\\'" . ghc-core-mode)
+         ("\\.ghci\\'" . ghci-script-mode-mode)
+         ("\\.chs\\'" . haskell-c2hs-mode)
+         ("\\.cabal\\'" . haskell-cabal-mode)
+         ("\\.[gh]s\\'" . haskell-mode)
+         ("\\.l[gh]s\\'" . literate-haskell-mode)
+         ("\\.hsc\\'" . haskell-mode))
+  :interpreter ("runghc" "runhaskell"))
 (use-package less-css-mode     :mode "\\.less\\'")
 (use-package markdown-mode     :mode ("\\.markdown\\'" "\\.md\\'" "\\.ronn\\'"))
 (use-package nginx-mode        :mode ("nginx\\.conf\\'" "/nginx/.+\\.conf\\'"))
-(use-package php-mode          :mode ("\\.php[s345t]?\\'" "/\\.php_cs\\(\\.dist\\)?\\'" "\\.phtml\\'" "/Amkfile\\'" "\\.amk\\'"))
+(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 yaml-mode         :mode "\\.e?ya?ml\\'")
+(use-package yaml-mode         :mode "\\.\\(e?ya?\\|ra\\)ml\\'")
 
 ;;(use-package nxhtml) ; nxhtml is invasive, only enable if actively using
 
+;; IDK? I guess I decided that plain php-mode had improved?
+;;
+;;(use-package php-mode-improved
+;;  :mode (("\\.php[s34]?\\'" . php-mode)
+;;         ("\\.phtml\\'" . php-mode)
+;;         ("\\.inc\\'" . php-mode))
+;;  :config (add-hook 'php-mode-hook
+;;                    '(lambda ()
+;;                       (c-set-offset 'cpp-macro 0)
+;;                       )))
+
 (if (file-exists-p "~/Maildir")
     ;;'(apel flim semi wanderlust)
     (use-package wanderlust