summaryrefslogtreecommitdiff
path: root/.config/emacs/init.el
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-10-01 16:16:01 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-01-10 19:29:50 -0500
commit45cc3dcf12449db18f328736a267e3b2e921824f (patch)
tree410e61ca01259cf64806edc81394a03c767913a9 /.config/emacs/init.el
parenta8aafd4f2710f270bf0a0f3cbb487a9253f147a8 (diff)
emacs: clean up use-package
Diffstat (limited to '.config/emacs/init.el')
-rw-r--r--.config/emacs/init.el29
1 files changed, 17 insertions, 12 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 1a5d719..bc7308a 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -90,12 +90,29 @@
(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 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 +121,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)