* emacs/guix-init.el: Move the code for auto-loading Emacs packages to...
(guix-package-enable-at-startup): Move to...
* emacs/guix-emacs.el (guix-package-enable-at-startup): ... here.
---
emacs/guix-emacs.el | 12
emacs/guix-init.el | 13 -
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/emacs/guix-emacs.el b/emacs/guix-emacs.el
index 311ab33..37a0bb2 100644
--- a/emacs/guix-emacs.el
+++ b/emacs/guix-emacs.el
@@ -28,6 +28,14 @@
(unless (require 'guix-profiles nil t)
(defvar guix-user-profile (expand-file-name "~/.guix-profile")))
+(defcustom guix-package-enable-at-startup t
+ "If non-nil, activate Emacs packages installed in a user profile.
+Set this variable to nil before requiring `guix-emacs' file to
+avoid loading autoloads of Emacs packages installed in
+`guix-user-profile'."
+ :type 'boolean
+ :group 'guix)
+
(defcustom guix-emacs-activate-after-operation t
"Activate Emacs packages after installing.
If nil, do not load autoloads of the Emacs packages after
@@ -117,6 +125,10 @@ See `guix-emacs-activate-after-operation' for details."
;; profile will not be loaded).
(guix-emacs-load-autoloads guix-current-profile)))
+(when guix-package-enable-at-startup
+ (add-to-list 'load-path (guix-emacs-directory))
+ (guix-emacs-load-autoloads))
+
(provide 'guix-emacs)
;;; guix-emacs.el ends here
diff --git a/emacs/guix-init.el b/emacs/guix-init.el
index 1da6070..47ced6a 100644
--- a/emacs/guix-init.el
+++ b/emacs/guix-init.el
@@ -1,19 +1,6 @@
(require 'guix-autoloads)
(require 'guix-emacs)
-(defcustom guix-package-enable-at-startup t
- "If non-nil, activate Emacs packages installed in a user profile.
-Set this variable to nil before requiring `guix-init' file to
-avoid loading autoloads of Emacs packages installed in
-`guix-user-profile'."
- :type 'boolean
- :group 'guix)
-
-(add-to-list 'load-path (guix-emacs-directory))
-
-(when guix-package-enable-at-startup
- (guix-emacs-load-autoloads))
-
(add-hook 'scheme-mode-hook 'guix-devel-activate-mode-maybe)
(add-hook 'shell-mode-hook 'guix-build-log-minor-mode-activate-maybe)
--
2.6.3
