Re-order/tweak init-web.el

1 files changed, 17 insertions, 13 deletions

diff --git a/.emacs.d/lisp/init-web.el b/.emacs.d/lisp/init-web.el
index 4e1d542..f6eb515 100644
--- a/.emacs.d/lisp/init-web.el
+++ b/.emacs.d/lisp/init-web.el
@@ -1,16 +1,8 @@
-;;; init-ui.el --- Web Configuration File -*- lexical-binding: t -*-
+;;; init-web.el --- Web Configuration File -*- lexical-binding: t -*-
 ;;; Commentary:
 ;; Some parts copied from prelude-web.el, prelude-js.el and prelude-css.el
 ;;; Code:
 
-(use-package css-mode
-  :custom
-  (css-indent-offset 2)
-  :config
-  (rainbow-mode +1))
-
-(use-package sass-mode)
-
 (use-package web-mode
   :custom
   (web-mode-enable-auto-pairing nil)
@@ -36,6 +28,20 @@
   (add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode))
   (add-to-list 'auto-mode-alist '("/\\(views\\|html\\|theme\\|templates\\)/.*\\.php\\'" . web-mode)))
 
+(use-package css-mode
+  :custom
+  (css-indent-offset 2)
+  :config
+  (rainbow-mode +1))
+
+(use-package scss-mode
+  :config
+  (add-to-list 'auto-mode-alist '("\\.scss\\'" . scss-mode))
+  :custom
+  (scss-compile-at-save nil))
+
+(use-package sass-mode)
+
 (use-package tagedit
   :diminish
   :config (tagedit-add-paredit-like-keybindings)
@@ -44,6 +50,8 @@
 (use-package js2-mode
   :config
   (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
+  :custom
+  (js-indent-level 2)
   :hook (js2-mode . (lambda ()
                       (setq-local electric-layout-rules '((?\; . after)))
                       (setq mode-name "JS2")
@@ -54,9 +62,5 @@
   :config
   (add-to-list 'auto-mode-alist '("\\.mustache\\'" . mustache-mode)))
 
-(use-package scss-mode
- :custom
- (scss-compile-at-save nil))
-
 (provide 'init-web)
 ;;; init-web.el ends here