Skip to content

Commit

Permalink
revert(core)!: restore old proxy behavior (issues with deferred stuff)
Browse files Browse the repository at this point in the history
This reverts commit 67bbfde.
  • Loading branch information
abougouffa committed May 16, 2024
1 parent 3492b7f commit 51eaafb
Showing 1 changed file with 20 additions and 21 deletions.
41 changes: 20 additions & 21 deletions init.el
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@
;; Load user init tweaks when available
(+load-user-configs 'init-tweaks 'local/init-tweaks)

;; When `minemacs-proxies' is set in "early-init.el" or in "init-tweaks.el",
;; `minemacs-enable-proxy' will set the environment variables accordingly.
(minemacs-enable-proxy minemacs-proxies)

;; HACK: Load the environment variables saved from shell using `+env-save' to
;; `+env-file'. `+env-save' saves all environment variables except these matched
;; by `+env-deny-vars'.
Expand Down Expand Up @@ -241,27 +245,22 @@ goes idle."
'(me-builtin me-gc)
minemacs-core-modules)))

;; When `minemacs-proxies' is set in "early-init.el" or in "init-tweaks.el",
;; `+with-proxies' will set the environment variables accordingly. This is
;; useful when you are on a network that requires a specific proxy to connect to
;; internet.
(+with-proxies
;; 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))

(run-hooks 'minemacs-after-loading-modules-hook)

;; Write user custom variables to separate file instead of "init.el"
(setq custom-file (concat minemacs-config-dir "custom-vars.el"))

;; Load the custom variables file if it exists
(when (file-exists-p custom-file) (+load custom-file))

;; Load user configuration
(+load-user-configs 'config 'local/config))
;; 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))

(run-hooks 'minemacs-after-loading-modules-hook)

;; Write user custom variables to separate file instead of "init.el"
(setq custom-file (concat minemacs-config-dir "custom-vars.el"))

;; Load the custom variables file if it exists
(when (file-exists-p custom-file) (+load custom-file))

;; Load user configuration
(+load-user-configs 'config 'local/config)


(+log! "Loaded init.el")
Expand Down

0 comments on commit 51eaafb

Please sign in to comment.