Browse Source

emacs: Move profiles code to "guix-profiles.el.in".

* emacs/guix-base.el (guix-user-profile, guix-default-profile,
  guix-current-profile, guix-profile-prompt, guix-set-current-profile): Move
  to...
* emacs/guix-init.el.in (guix-default-profile): Move to...
* emacs/guix-profiles.el.in: ... here.  New file.
* configure.ac (AC_CONFIG_FILES): Add "emacs/guix-profiles.el".
* emacs.am (nodist_lisp_DATA): Likewise.
gn-latest-20200428
Alex Kost 5 years ago
parent
commit
3db349cb09
6 changed files with 67 additions and 49 deletions
  1. +1
    -0
      .gitignore
  2. +1
    -0
      configure.ac
  3. +2
    -1
      emacs.am
  4. +1
    -41
      emacs/guix-base.el
  5. +0
    -7
      emacs/guix-init.el.in
  6. +62
    -0
      emacs/guix-profiles.el.in

+ 1
- 0
.gitignore View File

@@ -110,3 +110,4 @@ GTAGS
/emacs/guix-autoloads.el
/emacs/guix-helper.scm
/emacs/guix-init.el
/emacs/guix-profiles.el

+ 1
- 0
configure.ac View File

@@ -185,6 +185,7 @@ AM_CONDITIONAL([HAVE_EMACS], [test "x$EMACS" != "xno"])
emacsuidir="${guilemoduledir}/guix/emacs"
AC_SUBST([emacsuidir])
AC_CONFIG_FILES([emacs/guix-init.el
emacs/guix-profiles.el
emacs/guix-helper.scm])

AC_OUTPUT

+ 2
- 1
emacs.am View File

@@ -36,7 +36,8 @@ dist_lisp_DATA = \
$(AUTOLOADS)

nodist_lisp_DATA = \
emacs/guix-init.el
emacs/guix-init.el \
emacs/guix-profiles.el

$(AUTOLOADS): $(ELFILES)
$(EMACS) --batch --eval \


+ 1
- 41
emacs/guix-base.el View File

@@ -28,52 +28,12 @@
;;; Code:

(require 'cl-lib)
(require 'guix-profiles)
(require 'guix-backend)
(require 'guix-utils)
(require 'guix-history)
(require 'guix-messages)

;;; Profiles

(defvar guix-user-profile
(expand-file-name "~/.guix-profile")
"User profile.")

(defvar guix-default-profile
(concat (or (getenv "NIX_STATE_DIR") "/var/guix")
"/profiles/per-user/"
(getenv "USER")
"/guix-profile")
"Default Guix profile.")

(defvar guix-current-profile guix-default-profile
"Current profile.")

(defun guix-profile-prompt (&optional default)
"Prompt for profile and return it.
Use DEFAULT as a start directory. If it is nil, use
`guix-current-profile'."
(let* ((path (read-file-name "Profile: "
(file-name-directory
(or default guix-current-profile))))
(path (directory-file-name (expand-file-name path))))
(if (string= path guix-user-profile)
guix-default-profile
path)))

(defun guix-set-current-profile (path)
"Set `guix-current-profile' to PATH.
Interactively, prompt for PATH. With prefix, use
`guix-default-profile'."
(interactive
(list (if current-prefix-arg
guix-default-profile
(guix-profile-prompt))))
(setq guix-current-profile path)
(message "Current profile has been set to '%s'."
guix-current-profile))

;;; Parameters of the entries



+ 0
- 7
emacs/guix-init.el.in View File

@@ -4,11 +4,4 @@
(replace-regexp-in-string "${prefix}" "@prefix@" "@emacsuidir@")
"Directory with scheme files for \"guix.el\" package.")

(defvar guix-default-profile
(concat (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix")
"/profiles/per-user/"
(getenv "USER")
"/guix-profile")
"Default Guix profile.")

(provide 'guix-init)

+ 62
- 0
emacs/guix-profiles.el.in View File

@@ -0,0 +1,62 @@
;;; guix-profiles.el --- Guix profiles

;; Copyright © 2014 Alex Kost <alezost@gmail.com>

;; This file is part of GNU Guix.

;; GNU Guix is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; GNU Guix is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Code:

(defvar guix-user-profile
(expand-file-name "~/.guix-profile")
"User profile.")

(defvar guix-default-profile
(concat (or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix")
"/profiles/per-user/"
(getenv "USER")
"/guix-profile")
"Default Guix profile.")

(defvar guix-current-profile guix-default-profile
"Current profile.")

(defun guix-profile-prompt (&optional default)
"Prompt for profile and return it.
Use DEFAULT as a start directory. If it is nil, use
`guix-current-profile'."
(let* ((path (read-file-name "Profile: "
(file-name-directory
(or default guix-current-profile))))
(path (directory-file-name (expand-file-name path))))
(if (string= path guix-user-profile)
guix-default-profile
path)))

(defun guix-set-current-profile (path)
"Set `guix-current-profile' to PATH.
Interactively, prompt for PATH. With prefix, use
`guix-default-profile'."
(interactive
(list (if current-prefix-arg
guix-default-profile
(guix-profile-prompt))))
(setq guix-current-profile path)
(message "Current profile has been set to '%s'."
guix-current-profile))

(provide 'guix-profiles)

;;; guix-profiles.el ends here

Loading…
Cancel
Save