Remove all references to the GuixSD name.
* README (About, Installation): Replace ‘GuixSD’ with ‘Guix System’. * doc/emacs-guix.texi (Package Commands, Profiles, Generations, System) (System From File, Services, Service Commands): Likewise. * elisp/guix-about.el (guix-logo-file): Unuse ‘guixsd-logo.svg’. * elisp/guix-utils.el (guix-guixsd?): Remove now unused procedure. (guix-read-os-file-name): Update docstring. * images/README: Refer to singular ‘guix-logo.svg’. * images/guixsd-logo.svg: Delete file. Signed-off-by: John Soo <jsoo1@asu.edu>
This commit is contained in:
Tobias Geerinckx-Rice
John Soo
parent
a42f66cb40
commit
825ab772f7
4
README
4
README
|
|
@ -22,7 +22,7 @@ In short, Emacs-Guix provides the following features:
|
|||
|
||||
+ profiles
|
||||
|
||||
+ profile generations (including system generations for GuixSD)
|
||||
+ profile generations (including system generations for Guix System)
|
||||
|
||||
+ packages
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ the current commit of Emacs-Guix using [[file:guix.scm]] file:
|
|||
guix package --install-from-file=guix.scm
|
||||
#+END_SRC
|
||||
|
||||
* IMPORTANT NOTE for non-GuixSD users
|
||||
* IMPORTANT NOTE for non-Guix-System users
|
||||
|
||||
If you installed Guix using [[https://www.gnu.org/software/guix/manual/en/html_node/Binary-Installation.html][Binary Installation]] method, most likely your
|
||||
environment (in particular, =GUILE_LOAD_PATH=) does not know where Guile
|
||||
|
|
|
|||
|
|
@ -339,7 +339,7 @@ Display installed packages. As explained above, @kbd{M-x
|
|||
guix-installed-packages} uses an arbitrary profile that you can specify,
|
||||
while the other commands display packages installed in 2 special
|
||||
profiles: @file{~/.guix-profile} and @file{/run/current-system/profile}
|
||||
(only on GuixSD).
|
||||
(only on Guix System).
|
||||
|
||||
@findex guix-obsolete-packages
|
||||
@item M-x guix-obsolete-packages
|
||||
|
|
@ -632,7 +632,7 @@ the default user profile
|
|||
profile, populated by @code{guix pull}
|
||||
|
||||
@item /var/guix/profiles/system
|
||||
system profile (only on GuixSD)
|
||||
system profile (only on Guix System)
|
||||
|
||||
@item @env{GUIX_PROFILE}
|
||||
(only if this environment variable is set and this profile is not the
|
||||
|
|
@ -739,7 +739,7 @@ date/time prompt,,, org, The Org Manual}).
|
|||
|
||||
@end table
|
||||
|
||||
If you use GuixSD, you may also look at the system generations using
|
||||
If you use Guix System, you may also look at the system generations using
|
||||
the similar commands (@pxref{System Commands}).
|
||||
|
||||
@node Generation Keys
|
||||
|
|
@ -783,7 +783,7 @@ with another marked generation.
|
|||
@node System
|
||||
@chapter System
|
||||
|
||||
This chapter describes Emacs-Guix features related to GuixSD, in
|
||||
This chapter describes Emacs-Guix features related to Guix System, in
|
||||
particular:
|
||||
|
||||
@itemize
|
||||
|
|
@ -802,7 +802,7 @@ particular:
|
|||
@section System From File
|
||||
|
||||
@cindex system
|
||||
Your system configuration file (for GuixSD) contains
|
||||
Your system configuration file (for Guix System) contains
|
||||
@code{operating-system} declaration (@pxref{operating-system
|
||||
Reference,,, guix, The GNU Guix Reference Manual}).
|
||||
|
||||
|
|
@ -823,7 +823,7 @@ provides.
|
|||
@section Services
|
||||
|
||||
@cindex services
|
||||
If you use GuixSD, you may have a wish to become more familiar with
|
||||
If you use Guix System, you may have a wish to become more familiar with
|
||||
the system services (@pxref{Services,,, guix, The GNU Guix Reference
|
||||
Manual}). Emacs-Guix provides several commands to display these
|
||||
services.
|
||||
|
|
@ -838,7 +838,7 @@ services.
|
|||
|
||||
The interface for services is very similar to the interface for
|
||||
packages (@pxref{Packages}). The following commands allows you to
|
||||
look at the GuixSD services.
|
||||
look at the Guix System services.
|
||||
|
||||
@table @kbd
|
||||
|
||||
|
|
|
|||
|
|
@ -80,13 +80,10 @@ This is not really a text, it is a list of arguments passed to
|
|||
`fancy-splash-insert'.")
|
||||
|
||||
(defun guix-logo-file ()
|
||||
"Return the file name of Guix(SD) logo image.
|
||||
Return nil, if the image cannot be found."
|
||||
"Return the file name of the Guix logo image.
|
||||
Return nil if the image cannot be found."
|
||||
(when guix-image-directory
|
||||
(expand-file-name (if (guix-guixsd?)
|
||||
"guixsd-logo.svg"
|
||||
"guix-logo.svg")
|
||||
guix-image-directory)))
|
||||
(expand-file-name "guix-logo.svg" guix-image-directory)))
|
||||
|
||||
;; Guix builds Emacs-Guix with 'emacs-minimal' package which does not
|
||||
;; support many things including image stuff. This leads to a
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
;;; Commentary:
|
||||
|
||||
;; This file provides a 'list' interface for displaying locations of
|
||||
;; GuixSD services.
|
||||
;; Guix System services.
|
||||
|
||||
;;; Code:
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
;;; Commentary:
|
||||
|
||||
;; This file provides 'list'/'info' interface for GuixSD services.
|
||||
;; This file provides 'list'/'info' interface for Guix System services.
|
||||
|
||||
;;; Code:
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
;;; Commentary:
|
||||
|
||||
;; This file provides 'info' interface for GuixSD system configuration
|
||||
;; This file provides 'info' interface for Guix System configuration
|
||||
;; files – i.e., for 'operating-system' declaration.
|
||||
|
||||
;;; Code:
|
||||
|
|
|
|||
|
|
@ -28,10 +28,6 @@
|
|||
(require 'bui-utils)
|
||||
(require 'guix nil t)
|
||||
|
||||
(defun guix-guixsd? ()
|
||||
"Return non-nil, if current system is GuixSD."
|
||||
(file-exists-p "/run/current-system"))
|
||||
|
||||
(defun guix-assert-build-farm ()
|
||||
"Raise an error if `build-farm' package does not exist."
|
||||
(unless (require 'build-farm nil t)
|
||||
|
|
@ -336,7 +332,7 @@ See `guix-support-dired' for details. See also `guix-read-file-name'."
|
|||
mustmatch initial predicate)))
|
||||
|
||||
(defun guix-read-os-file-name ()
|
||||
"Read file name with GuixSD 'operating-system' declaration."
|
||||
"Read file name with Guix System 'operating-system' declaration."
|
||||
(guix-read-file-name-maybe "System configuration file: "))
|
||||
|
||||
(defun guix-find-file (file)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
;;
|
||||
;; - to look at, compare and remove profile generations;
|
||||
;;
|
||||
;; - to look at system services and generations (if you use GuixSD);
|
||||
;; - to look at system services and generations (if you use Guix System);
|
||||
;;
|
||||
;; - to do many other things.
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
-*- org -*-
|
||||
|
||||
Guix(SD) logotips ("guix-logo.svg" and "guixsd-logo.svg" files) were
|
||||
taken from the [[http://git.savannah.gnu.org/cgit/guix/guix-artwork.git][Guix Artwork repository]] (original names: "Guix.svg" and
|
||||
"GuixSD.svg" in "logo" directory). They are available under the terms
|
||||
The Guix logotype ("guix-logo.svg" file) was
|
||||
taken from the [[http://git.savannah.gnu.org/cgit/guix/guix-artwork.git][Guix Artwork repository]] (original name: "Guix.svg"
|
||||
in "logo" directory). Is is available under the terms
|
||||
of the Creative Commons Attribution-ShareAlike 4.0 International
|
||||
License.
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 115 KiB |
|
|
@ -20,7 +20,7 @@
|
|||
;;; Commentary:
|
||||
|
||||
;; This module provides the code to get info about system generations of
|
||||
;; GuixSD profiles.
|
||||
;; Guix System profiles.
|
||||
|
||||
;;; Code:
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue