|
123 | 123 | (+load minemacs-loaddefs-file)
|
124 | 124 |
|
125 | 125 | ;; Load user init tweaks from "$MINEMACSDIR/init-tweaks.el" when available
|
126 |
| -(let ((user-init-tweaks (concat minemacs-config-dir "init-tweaks.el"))) |
127 |
| - (when (file-exists-p user-init-tweaks) |
128 |
| - (+load user-init-tweaks))) |
| 126 | +(unless (or (getenv "MINEMACS_IGNORE_USER_CONFIG") (getenv "MINEMACS_IGNORE_INIT_TWEAKS_EL")) |
| 127 | + (let ((user-init-tweaks (concat minemacs-config-dir "init-tweaks.el"))) |
| 128 | + (when (file-exists-p user-init-tweaks) |
| 129 | + (+load user-init-tweaks)))) |
129 | 130 |
|
130 | 131 | ;; HACK: When Emacs is launched from the terminal (in GNU/Linux), it inherits
|
131 | 132 | ;; the terminal's environment variables, which can be useful specially for
|
|
198 | 199 | ;; Load the default list of enabled modules (`minemacs-modules' and `minemacs-core-modules')
|
199 | 200 | (+load minemacs-core-dir "me-modules.el")
|
200 | 201 |
|
201 |
| - ;; The modules.el file can override minemacs-modules and minemacs-core-modules |
202 |
| - (let ((user-conf-modules (concat minemacs-config-dir "modules.el"))) |
203 |
| - (when (file-exists-p user-conf-modules) |
204 |
| - (+load user-conf-modules)))) |
| 202 | + (unless (or (getenv "MINEMACS_IGNORE_USER_CONFIG") (getenv "MINEMACS_IGNORE_MODULES_EL")) |
| 203 | + ;; The modules.el file can override minemacs-modules and minemacs-core-modules |
| 204 | + (let ((user-conf-modules (concat minemacs-config-dir "modules.el"))) |
| 205 | + (when (file-exists-p user-conf-modules) |
| 206 | + (+load user-conf-modules))))) |
205 | 207 |
|
206 | 208 | ;; Load fonts early (they are read from the default `minemacs-default-fonts').
|
207 | 209 | (+set-fonts)
|
|
245 | 247 | (+load custom-file))
|
246 | 248 |
|
247 | 249 | ;; Load user configuration from "$MINEMACSDIR/config.el" when available
|
248 |
| -(let ((user-config (concat minemacs-config-dir "config.el"))) |
249 |
| - (when (file-exists-p user-config) |
250 |
| - (+load user-config))) |
| 250 | +(unless (or (getenv "MINEMACS_IGNORE_USER_CONFIG") (getenv "MINEMACS_IGNORE_CONFIG_EL")) |
| 251 | + (let ((user-config (concat minemacs-config-dir "config.el"))) |
| 252 | + (when (file-exists-p user-config) |
| 253 | + (+load user-config)))) |
251 | 254 |
|
252 | 255 | (+lazy-when! (featurep 'native-compile)
|
253 | 256 | (+info! "Trying to clean outdated native compile cache")
|
|
0 commit comments