From 6a69add73f2a4865f82ebc9ad3ca6b36ab9c89c5 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 30 Jun 2025 14:45:54 +0200 Subject: [PATCH] refactor(file-templates): update doomrc templates For .doom, .doommodule, and .doom.el files. --- docs/examples.org | 4 ++-- modules/editor/file-templates/config.el | 10 +++++++++- .../templates/emacs-lisp-mode/__doommodulerc | 11 +++++++++++ .../file-templates/templates/emacs-lisp-mode/__doomrc | 11 +++-------- .../templates/emacs-lisp-mode/__doomrc_el | 8 ++++++++ 5 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 modules/editor/file-templates/templates/emacs-lisp-mode/__doommodulerc create mode 100644 modules/editor/file-templates/templates/emacs-lisp-mode/__doomrc_el diff --git a/docs/examples.org b/docs/examples.org index 51287c7ab..8c3c9a048 100644 --- a/docs/examples.org +++ b/docs/examples.org @@ -127,8 +127,8 @@ complete example in [[id:f9bce7da-d155-4727-9b6f-b566b5b8d824][the previous sect (var :directive values...)) #+end_src -*** TODO =.doomrc= -*** TODO =.doomproject= +*** TODO =.doom= +*** TODO =.doom.el= *** TODO =.doommodule= ** TODO Templates *** TODO User configuration diff --git a/modules/editor/file-templates/config.el b/modules/editor/file-templates/config.el index 048deb558..30aab1b07 100644 --- a/modules/editor/file-templates/config.el +++ b/modules/editor/file-templates/config.el @@ -19,9 +19,17 @@ don't have a :trigger property in `+file-templates-alist'.") ("/Makefile$" :mode makefile-gmake-mode) ;; elisp ("/\\.dir-locals\\.el$") - ("/\\.doomrc$" + ("/\\.doom$" :trigger "__doomrc" :mode emacs-lisp-mode) + ("/\\.doom\\(?:module\\)?$" + :trigger "__doommodulerc" + :mode emacs-lisp-mode) + ("/\\.doom\\.el$" + :trigger "__doomrc_el" + :mode emacs-lisp-mode) + ;; TODO: .doomprofile + ;; TODO: profiles.el/doom-profiles.el ("/packages\\.el$" :when +file-templates-in-emacs-dirs-p :trigger "__doom-packages" :mode emacs-lisp-mode) diff --git a/modules/editor/file-templates/templates/emacs-lisp-mode/__doommodulerc b/modules/editor/file-templates/templates/emacs-lisp-mode/__doommodulerc new file mode 100644 index 000000000..34dde9d66 --- /dev/null +++ b/modules/editor/file-templates/templates/emacs-lisp-mode/__doommodulerc @@ -0,0 +1,11 @@ +$0`doom-version` +((name :group module) + ;; (alias :group2 module2) + (version . "0.0.1") + ;; (depth 0) + (since . "`doom-modules-version`") + (flags) + (features) + (packages) + (requires) + (checks)) \ No newline at end of file diff --git a/modules/editor/file-templates/templates/emacs-lisp-mode/__doomrc b/modules/editor/file-templates/templates/emacs-lisp-mode/__doomrc index f55a917de..b4c4a9d93 100644 --- a/modules/editor/file-templates/templates/emacs-lisp-mode/__doomrc +++ b/modules/editor/file-templates/templates/emacs-lisp-mode/__doomrc @@ -1,8 +1,3 @@ -;;; .doomrc --- doom runtime config -*- mode: emacs-lisp; lexical-binding: t; -*- -;;; Commentary: -;;; Code: -(require 'doom) ; be silent, byte-compiler - -$0`%` - -;;; .doomrc ends here +`doom-version` +((name . project-name) + $0) diff --git a/modules/editor/file-templates/templates/emacs-lisp-mode/__doomrc_el b/modules/editor/file-templates/templates/emacs-lisp-mode/__doomrc_el new file mode 100644 index 000000000..f55a917de --- /dev/null +++ b/modules/editor/file-templates/templates/emacs-lisp-mode/__doomrc_el @@ -0,0 +1,8 @@ +;;; .doomrc --- doom runtime config -*- mode: emacs-lisp; lexical-binding: t; -*- +;;; Commentary: +;;; Code: +(require 'doom) ; be silent, byte-compiler + +$0`%` + +;;; .doomrc ends here