diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-01-10 19:38:58 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-01-10 19:38:58 -0500 |
commit | a2cd9d788f7b39e9f17d1fa2dc1382bd2f98e2c1 (patch) | |
tree | f2f5c900f0c9aded26d3d9ca0c25e9a6029a7a9e /.config/emacs/init.el | |
parent | 75a63c7e7b3b055198884f31c0d7c516eaf9d32e (diff) | |
parent | 971e265cac74976670da2a87805b644e90826b95 (diff) |
Merge branch 'master' into build64-par/master
Diffstat (limited to '.config/emacs/init.el')
-rw-r--r-- | .config/emacs/init.el | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 1a5d719..4d6543b 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -90,12 +90,31 @@ (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 + +;; IDK? I guess I decided that plain php-mode had improved? +;; ;;(use-package php-mode-improved ;; :mode (("\\.php[s34]?\\'" . php-mode) ;; ("\\.phtml\\'" . php-mode) @@ -104,18 +123,6 @@ ;; '(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 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\\'")) -(use-package scss-mode :mode "\\.scss\\'") -(use-package yaml-mode :mode "\\.e?ya?ml\\'") - -;;(use-package nxhtml) ; nxhtml is invasive, only enable if actively using (if (file-exists-p "~/Maildir") ;;'(apel flim semi wanderlust) |