diff --git a/README.org b/README.org index d8abb5f2..3da0405a 100644 --- a/README.org +++ b/README.org @@ -1767,7 +1767,8 @@ Tempel is another templating system. Also perhaps even more powerful with it's e (use-package tempel :bind (("M-+" . tempel-complete) ;; Alternative tempel-expand ("M-'" . tempel-insert) - ("C-M-" . tempel-done)) + ("C-M-" . tempel-done) + ("TAB" . tempel-next)) :init @@ -1980,7 +1981,20 @@ For developing websites, I like to use web-mode (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.djhtml?\\'" . web-mode))) + (add-to-list 'auto-mode-alist '("\\.djhtml?\\'" . web-mode)) + + (setq web-mode-enable-auto-pairing t + web-mode-enable-auto-expanding t + web-mode-enable-auto-closing t + web-mode-enable-current-column-highlight t + web-mode-enable-current-element-highlight t) + + :general + (general-def 'normal web-mode-map + "TAB" 'indent-according-to-mode) + (general-def 'insert web-mode-map + "TAB" 'indent-according-to-mode) + ) #+end_src *** Lua diff --git a/init.el b/init.el index be68b275..b201c83f 100644 --- a/init.el +++ b/init.el @@ -1218,7 +1218,8 @@ targets." (use-package tempel :bind (("M-+" . tempel-complete) ;; Alternative tempel-expand ("M-'" . tempel-insert) - ("C-M-" . tempel-done)) + ("C-M-" . tempel-done) + ("TAB" . tempel-next)) :init @@ -1373,7 +1374,20 @@ targets." (add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) (add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode)) - (add-to-list 'auto-mode-alist '("\\.djhtml?\\'" . web-mode))) + (add-to-list 'auto-mode-alist '("\\.djhtml?\\'" . web-mode)) + + (setq web-mode-enable-auto-pairing t + web-mode-enable-auto-expanding t + web-mode-enable-auto-closing t + web-mode-enable-current-column-highlight t + web-mode-enable-current-element-highlight t) + + :general + (general-def 'normal web-mode-map + "TAB" 'indent-according-to-mode) + (general-def 'insert web-mode-map + "TAB" 'indent-according-to-mode) + ) (use-package lua-mode :mode ("\\.lua\\'" . lua-mode)) diff --git a/recentf b/recentf index 4cc65db1..278bb91b 100644 --- a/recentf +++ b/recentf @@ -1,4 +1,4 @@ -;;; Automatically generated by ‘recentf’ on Fri Oct 28 10:58:11 2022. +;;; Automatically generated by ‘recentf’ on Fri Nov 11 09:46:17 2022. (setq recentf-list 'nil) diff --git a/templates b/templates index d4b927a7..3bf6be6e 100644 --- a/templates +++ b/templates @@ -87,3 +87,9 @@ org-mode :post (progn (tempel-done) (org-edit-src-code))) (nix "#+begin_src nix" n> r> n "#+end_src" :post (progn (tempel-done) (org-edit-src-code))) + +web-mode + +(div "
" n> r> n> "
" n) +(input "") +(label "