diff options
| -rw-r--r-- | emacs/guix-backend.el | 3 | ||||
| -rw-r--r-- | emacs/guix-config.el.in | 14 | ||||
| -rw-r--r-- | emacs/guix-external.el | 11 | ||||
| -rw-r--r-- | emacs/guix-profiles.el | 2 |
4 files changed, 18 insertions, 12 deletions
diff --git a/emacs/guix-backend.el b/emacs/guix-backend.el index 412d648b9d..e7c158bef4 100644 --- a/emacs/guix-backend.el +++ b/emacs/guix-backend.el @@ -56,9 +56,10 @@ (require 'geiser-guile) (require 'guix-geiser) (require 'guix-config) +(require 'guix-external) (require 'guix-emacs) -(defvar guix-load-path guix-emacs-interface-directory +(defvar guix-load-path guix-config-emacs-interface-directory "Directory with scheme files for \"guix.el\" package.") (defvar guix-helper-file diff --git a/emacs/guix-config.el.in b/emacs/guix-config.el.in index c7affb8c6d..bd821596c4 100644 --- a/emacs/guix-config.el.in +++ b/emacs/guix-config.el.in @@ -20,21 +20,15 @@ ;;; Code: -(defconst guix-emacs-interface-directory +(defconst guix-config-emacs-interface-directory (replace-regexp-in-string "${prefix}" "@prefix@" "@emacsuidir@")) -(defconst guix-state-directory +(defconst guix-config-state-directory ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix")) -(defvar guix-guile-program "@GUILE@" - "Name of the guile executable used for Guix REPL. -May be either a string (the name of the executable) or a list of -strings of the form: - - (NAME . ARGS) - -Where ARGS is a list of arguments to the guile program.") +(defconst guix-config-guile-program "@GUILE@" + "Name of the 'guile' executable defined at configure time.") (defconst guix-config-dot-program "@DOT_USER_PROGRAM@" "Name of the 'dot' executable defined at configure time.") diff --git a/emacs/guix-external.el b/emacs/guix-external.el index cf4bd26ac7..c80b36343d 100644 --- a/emacs/guix-external.el +++ b/emacs/guix-external.el @@ -29,6 +29,17 @@ "Settings for external programs." :group 'guix) +(defcustom guix-guile-program guix-config-guile-program + "Name of the 'guile' executable used for Guix REPL. +May be either a string (the name of the executable) or a list of +strings of the form: + + (NAME . ARGS) + +Where ARGS is a list of arguments to the guile program." + :type 'string + :group 'guix-external) + (defcustom guix-dot-program (if (file-name-absolute-p guix-config-dot-program) guix-config-dot-program diff --git a/emacs/guix-profiles.el b/emacs/guix-profiles.el index 1a41745512..2c1936864f 100644 --- a/emacs/guix-profiles.el +++ b/emacs/guix-profiles.el @@ -26,7 +26,7 @@ "User profile.") (defvar guix-default-profile - (concat guix-state-directory + (concat guix-config-state-directory "/profiles/per-user/" (getenv "USER") "/guix-profile") |