refactor!: move optional modules from core to modules

This should be backward compatible for the moment. But later, only the
`minemacs-modules` variable should be set.

Author: abougouffa

core/me-builtin.el

@@ -1519,7 +1519,7 @@ Useful for quickly switching to an open buffer."
   ;; Fallback the new `fido-vertical-mode' Emacs28+ builtin completion mode if
   ;; the `me-completion' (which contains `vertico-mode' configuration) core
   ;; module is not enabled.
-  :unless (and (memq 'me-completion minemacs-core-modules) (not (+package-disabled-p 'vertico)))
+  :when (+package-disabled-p 'vertico 'me-completion)
   :hook (minemacs-lazy . fido-vertical-mode))
 
 (use-package battery

core/me-modules.el

@@ -6,25 +6,23 @@
 
 ;;; Code:
 
-(defcustom minemacs-core-modules
-  '(me-completion
-    me-core-ui
-    me-evil
-    me-keybindings
-    me-splash)
+(defcustom minemacs-core-modules '()
   "MinEmacs enabled core modules."
   :group 'minemacs-core
   :type '(repeat symbol))
 
+(make-obsolete-variable 'minemacs-core-modules 'minemacs-modules "MinEmacs v7.0.0")
+
 (defcustom minemacs-modules
-  '(
-    ;; me-ai
+  '(;; me-ai
     ;; me-biblio
     ;; me-binary
     ;; me-calendar
     me-checkers
     ;; me-clojure
     ;; me-common-lisp
+    me-completion
+    me-core-ui
     me-daemon
     me-data
     me-debug
@@ -33,9 +31,12 @@
     me-emacs-lisp
     ;; me-email
     ;; me-embedded
+    me-evil
     me-extra
     me-files
     ;; me-fun
+    ;; me-gtd
+    me-keybindings
     me-latex
     ;; me-lifestyle
     ;; me-math
@@ -52,6 +53,7 @@
     ;; me-rss
     ;; me-scheme
     ;; me-services
+    me-splash
     ;; me-tags
     me-tools
     me-tty

init.el

@@ -99,7 +99,7 @@
   (load (expand-file-name "core/me-vars.el" (file-name-directory (file-truename load-file-name))) nil t))
 
 ;; Add some of MinEmacs' directories to `load-path'.
-(setq load-path (append (list minemacs-core-dir minemacs-elisp-dir minemacs-extras-dir) load-path))
+(setq load-path (append (list minemacs-core-dir minemacs-elisp-dir minemacs-extras-dir minemacs-modules-dir) load-path))
 
 ;; Load MinEmacs' library
 (require 'me-lib)
@@ -246,19 +246,16 @@ goes idle."
 ;; to use some of the new Emacs 29 functions even on earlier Emacs versions,
 ;; this can be useful when configuring the module's packages and adding new
 ;; functionality.
-(setq minemacs-core-modules
-      (delete-dups
-       (append (when (memq 'me-splash minemacs-core-modules) '(me-splash))
-               '(me-bootstrap)
-               (when (< emacs-major-version 29) '(me-compat))
-               '(me-builtin me-gc)
-               minemacs-core-modules)))
-
-;; Load MinEmacs modules
-(dolist (module-file (append
-                      (mapcar (apply-partially #'format "%s%s.el" minemacs-core-dir) minemacs-core-modules)
-                      (mapcar (apply-partially #'format "%s%s.el" minemacs-modules-dir) minemacs-modules)))
-  (+load module-file))
+(let ((splash (when (memq 'me-splash minemacs-core-modules) '(me-splash))))
+  (setq minemacs-modules (delete-dups (append minemacs-core-modules minemacs-modules))
+        minemacs-core-modules '(me-bootstrap me-compat me-builtin me-gc))
+
+  ;; Load MinEmacs modules
+  (dolist (module (delete-dups (append splash minemacs-core-modules minemacs-modules)))
+    (let ((module-file (format "%s%s.el" minemacs-core-dir module)))
+      (if (file-exists-p module-file)
+          (+load module-file)
+        (+load (format "%s%s.el" minemacs-modules-dir module))))))
 
 (run-hooks 'minemacs-after-loading-modules-hook)
 

modules/extras/me-org-export-async-init.el

@@ -23,8 +23,7 @@
 (provide 'me-org-export-async-init)
 
 ;; Load only some essential modules
-(setq minemacs-core-modules '(me-builtin)
-      minemacs-modules '(me-org me-biblio me-latex me-project me-prog me-data me-emacs-lisp))
+(setq minemacs-modules '(me-org me-biblio me-latex me-project me-prog me-data me-emacs-lisp))
 
 (load (concat user-emacs-directory "init.el") nil t)
 

core/me-completion.el renamed to modules/me-completion.el

@@ -3,15 +3,6 @@
 ;; Copyright (C) 2022 Abdelhak Bougouffa
 
 ;; This file can be used to override `minemacs-modules'
-;; and `minemacs-core-modules'
-
-;;; Ordered list of enabled core modules
-(setq minemacs-core-modules
-      '(me-splash         ; Simple splash screen
-        me-keybindings    ; Keybinding (general, which-key, hydra, ...)
-        me-evil           ; Emacs as Vim (evil, evil-collection, evil-snipe, evil-numbers, ...)
-        me-core-ui        ; Core UI (doom-themes, modus-themes, doom-modeline, ...)
-        me-completion))   ; Completion (vertico, marginalia, corfu, cape, consult, embark, ...)
 
 ;;; List of enabled modules
 (setq minemacs-modules
@@ -21,6 +12,8 @@
         me-checkers       ; Static checkers (flymake-collection, flymenu, flymake-cppcheck, ...)
         ;; me-clojure     ; Clojure development (clojure-mode, cider, ...)
         ;; me-common-lisp ; Common Lisp development (sly, sly-quicklisp, ...)
+        me-completion     ; Completion (vertico, marginalia, corfu, cape, consult, embark, ...)
+        me-core-ui        ; Core UI (doom-themes, modus-themes, doom-modeline, ...)
         ;; me-daemon      ; Emacs daemon tweaks
         me-data           ; Data file formats and tools (csv, yaml, toml, json, plantuml-mode, jq-mode, ...)
         me-debug          ; Debugging tools (realgud, disaster, dape, rmsbolt, beardbolt, ...)
@@ -29,10 +22,12 @@
         me-emacs-lisp     ; Emacs lisp development (parinfer-rust, macrostep, eros, helpful, ...)
         ;; me-email       ; Email (mu4e, mu4e-alert, org-msg, ...)
         ;; me-embedded    ; Embedded systems (embed, arduino-mode, openocd, bitbake, dts-mode, ...)
+        me-evil           ; Emacs as Vim (evil, evil-collection, evil-snipe, evil-numbers, ...)
         me-extra          ; Extra features (better-jumper, crux, ...)
         me-files          ; Files and directories (dirvish, vlf, sudo-edit, ztree, ...)
         me-fun            ; Games and funny packages (xkcd, speed-type, wordel, ...)
         ;; me-gtd         ; Getting Things Done (org-gtd, ...)
+        me-keybindings    ; Keybinding (general, which-key, hydra, ...)
         me-latex          ; LaTeX (auctex, auctex-latexmk, LaTeX-preview-pane, ...)
         ;; me-lifestyle   ; *Very* opinionated lifestyle packages (awqat, ...)
         ;; me-math        ; Mathematics (maxima, ess, ein, code-cells, julia-mode, ...)
@@ -49,6 +44,7 @@
         ;; me-rss         ; News feed (elfeed, ...)
         ;; me-scheme      ; Scheme development (racket-mode, geiser, ...)
         me-services       ; Web services (org-jira, ...)
+        me-splash         ; Simple splash screen
         ;; me-tags        ; Source code tagging tools (citre, ggtags, clink, ...)
         me-tools          ; System tools (vterm, tldr, ssh-deploy, docker, logview, with-editor, ...)
         me-tty            ; Emacs from terminal (xclip, ...)