commit - 93201a027904566efbca7f8e83066acd31e89c26
commit + 39b783404cf36a34bb4fb1b87074a31af0638c86
blob - f6a0ed1655d2c6e0f65a3c6a77b989fe45ecbf37
blob + 7c8a527c8ef8a5e1bf8e2d1085278caaa2a1130d
--- emacs/init.el
+++ emacs/init.el
@@ -295,13 +295,20 @@
         nameless-affect-indentation-and-filling nil)
   (define-key emacs-lisp-mode-map (kbd "_") #'nameless-insert-name-or-self-insert))
 
+(add-to-list 'auto-mode-alist '("\\.html\\'" . web-mode))
 (with-eval-after-load 'web-mode
   (setq web-mode-markup-indent-offset 2
         web-mode-css-indent-offset 2
         web-mode-style-padding 0
         web-mode-enable-engine-detection t)
-  (add-hook 'web-mode-hook #'op/disable-tabs))
+  (add-hook 'web-mode-hook #'op/disable-tabs)
 
+  ;; fix .dir-locals.el
+  (defun op/web-mode-fix-dir-locals ()
+    (when (derived-mode-p major-mode 'web-mode)
+      (web-mode-guess-engine-and-content-type)))
+  (add-hook 'hack-local-variables-hook #'op/web-mode-fix-dir-locals))
+
 (with-eval-after-load 'css-mode
   (add-hook 'css-mode-hook #'op/disable-tabs))