From cc7c66d2fb69df3cb176ed68eb5c776305994f51 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 9 Mar 2018 15:12:58 -0500 Subject: emacs: tidy major modes --- .config/emacs/init.el | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 4b91d8f..da8763f 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -75,11 +75,24 @@ (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 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\\'") + :config (add-hook 'graphviz-dot-mode-hook + '(lambda () + (set (make-local-variable 'graphviz-dot-auto-indent-on-semi) nil) + ))) +(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\\'" @@ -91,26 +104,14 @@ (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\\'") -(use-package graphviz-dot-mode - :mode ("\\.dot\\'" "\\.gv\\'") - :config (add-hook 'graphviz-dot-mode-hook - '(lambda () - (set (make-local-variable 'graphviz-dot-auto-indent-on-semi) nil) - ))) (use-package haml-mode :mode "\\.haml\\'") (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\\'") :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 -- cgit v1.2.3