summaryrefslogtreecommitdiff
path: root/.config/emacs/init.el
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs/init.el')
-rw-r--r--.config/emacs/init.el27
1 files changed, 25 insertions, 2 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 1a5d719..1dee34a 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -108,15 +108,38 @@
(use-package glsl-mode :mode ("\\.vert\\'" "\\.frag\\'" "\\.geom\\'" "\\.glsl\\'"))
(use-package go-mode :mode "\\.go\\'")
(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