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

doc/emacs-guix.texi

@@ -9,7 +9,7 @@ This document describes Emacs-Guix, the Emacs interface for the
 @uref{https://www.gnu.org/software/guix/, GNU Guix} package manager.
 
 @quotation
-Copyright @copyright{} 2014-2019 Alex Kost@*
+Copyright @copyright{} 2014-2019, 2021 Alex Kost@*
 Copyright @copyright{} 2018 Oleg Pykhalov
 
 Permission is granted to copy, distribute and/or modify this document
@@ -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
@@ -368,6 +368,19 @@ separated by commas) and a dependency type (it should be either
 @item M-x guix-packages-by-name
 Display package(s) with the specified name.
 
+@findex guix-packages-by-regexp
+@vindex guix-package-search-params
+@item M-x guix-packages-by-regexp
+Search for packages by a specified regexp.  By default, ``name'',
+``synopsis'' and ``description'' of the packages will be searched.  This
+can be changed by modifying @code{guix-package-search-params} variable.
+
+@findex guix-packages-by-name-regexp
+@item M-x guix-packages-by-name-regexp
+Search for packages with names matching a specified regexp.  This
+command is the same as @code{guix-packages-by-regexp}, except only a
+package ``name'' is searched.
+
 @findex guix-packages-by-license
 @item M-x guix-packages-by-license
 Display package(s) with the specified license.
@@ -391,19 +404,6 @@ Display packages from the specified file with @code{operating-system}
 declaration (@pxref{Using the Configuration System,,, guix, The GNU
 Guix Reference Manual}).
 
-@findex guix-search-by-regexp
-@vindex guix-package-search-params
-@item M-x guix-search-by-regexp
-Search for packages by a specified regexp.  By default, ``name'',
-``synopsis'' and ``description'' of the packages will be searched.  This
-can be changed by modifying @code{guix-package-search-params} variable.
-
-@findex guix-search-by-name
-@item M-x guix-search-by-name
-Search for packages with names matching a specified regexp.  This
-command is the same as @code{guix-search-by-regexp}, except only a
-package ``name'' is searched.
-
 @end table
 
 @vindex guix-package-list-type
@@ -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
 

elisp/guix-about.el

@@ -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

elisp/guix-help.el

@@ -1,6 +1,6 @@
 ;;; guix-help.el --- Help commands  -*- lexical-binding: t -*-
 
-;; Copyright © 2016–2019 Alex Kost <alezost@gmail.com>
+;; Copyright © 2016–2019, 2021 Alex Kost <alezost@gmail.com>
 
 ;; This file is part of Emacs-Guix.
 
@@ -80,11 +80,11 @@ If ARG is non-nil (interactively with prefix), show Guix info manual."
     guix-hidden-packages
     guix-dependent-packages
     guix-packages-by-name
+    guix-packages-by-regexp
+    guix-packages-by-name-regexp
     guix-packages-by-license
     guix-packages-by-location
     guix-package-from-file
-    guix-search-by-name
-    guix-search-by-regexp
     guix-packages-from-system-config-file
     nil
     guix-package-locations

elisp/guix-popup.el

@@ -1,6 +1,6 @@
 ;;; guix-popup.el --- Popup interface for Emacs-Guix commands
 
-;; Copyright © 2018–2019 Alex Kost <alezost@gmail.com>
+;; Copyright © 2018–2019, 2021 Alex Kost <alezost@gmail.com>
 
 ;; This file is part of Emacs-Guix.
 
@@ -102,9 +102,9 @@ String is made of variable VAR-NAME and its value."
              (?h "hidden" guix-hidden-packages)
              "Search for packages"
              (?n "by name" guix-packages-by-name)
-             (?N "by regexp (in name only)" guix-search-by-name)
+             (?N "by regexp (in name only)" guix-packages-by-name-regexp)
              (?r "by regexp (in name, synopsis, description)"
-                 guix-search-by-regexp)
+                 guix-packages-by-regexp)
              (?L "by location" guix-packages-by-location)
              (?c "by license" guix-packages-by-license)
              (?d "depending on other package(s)" guix-dependent-packages)

elisp/guix-ui-messages.el

@@ -194,7 +194,7 @@ Or it may be some package variant that cannot be handled by
 Emacs-Guix.  For example, it may be so called 'canonical package'
 used by '%%base-packages' in an operating-system declaration.
 
-Try \"\\[guix-search-by-name]\" to find this package.")
+Try \"\\[guix-packages-by-name-regexp]\" to find this package.")
                  (bui-get-string (car ids)))
       (message ""))))
 

elisp/guix-ui-package.el

@@ -1,6 +1,6 @@
 ;;; guix-ui-package.el --- Interface for displaying packages  -*- lexical-binding: t -*-
 
-;; Copyright © 2014–2019 Alex Kost <alezost@gmail.com>
+;; Copyright © 2014–2019, 2021 Alex Kost <alezost@gmail.com>
 
 ;; This file is part of Emacs-Guix.
 
@@ -1512,10 +1512,49 @@ a version number.  Examples: \"guile\", \"guile@2.0.11\".
 If PROFILE is nil, use `guix-current-profile'.
 Interactively with prefix, prompt for PROFILE."
   (interactive
-   (list (guix-read-package-name)
-         (guix-ui-read-package-profile)))
+   (let ((packages (guix-package-names))
+         (at-point (car (split-string (thing-at-point 'symbol t)
+                                      "@"))))
+     (list (guix-read-package-name "Package: "
+                                   (and (member at-point packages)
+                                        at-point))
+           (guix-ui-read-package-profile))))
   (guix-package-get-display profile 'name name))
 
+
+;;;###autoload
+(defun guix-packages-by-regexp (regexp &optional params profile)
+  "Search for Guix packages by REGEXP.
+PARAMS are package parameters that should be searched.
+If PARAMS are not specified, use `guix-package-search-params'.
+
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (read-regexp "Regexp: " nil 'guix-package-search-history)
+         nil (guix-ui-read-package-profile)))
+  (guix-package-get-display profile 'regexp regexp
+                            (or params guix-package-search-params)))
+
+;;;###autoload
+(define-obsolete-function-alias 'guix-search-by-regexp
+  'guix-packages-by-regexp "0.5.3")
+
+;;;###autoload
+(defun guix-packages-by-name-regexp (regexp &optional profile)
+  "Search for Guix packages matching REGEXP in a package name.
+If PROFILE is nil, use `guix-current-profile'.
+Interactively with prefix, prompt for PROFILE."
+  (interactive
+   (list (read-string "Package name by regexp: "
+                      nil 'guix-package-search-history)
+         (guix-ui-read-package-profile)))
+  (guix-packages-by-regexp regexp '(name) profile))
+
+;;;###autoload
+(define-obsolete-function-alias 'guix-search-by-name
+  'guix-packages-by-name-regexp "0.5.3")
+
 ;;;###autoload
 (defun guix-packages-by-license (license &optional profile)
   "Display Guix packages with LICENSE.
@@ -1582,31 +1621,6 @@ installed in a system profile, use
                             'from-os-file file))
 
 ;;;###autoload
-(defun guix-search-by-regexp (regexp &optional params profile)
-  "Search for Guix packages by REGEXP.
-PARAMS are package parameters that should be searched.
-If PARAMS are not specified, use `guix-package-search-params'.
-
-If PROFILE is nil, use `guix-current-profile'.
-Interactively with prefix, prompt for PROFILE."
-  (interactive
-   (list (read-regexp "Regexp: " nil 'guix-package-search-history)
-         nil (guix-ui-read-package-profile)))
-  (guix-package-get-display profile 'regexp regexp
-                            (or params guix-package-search-params)))
-
-;;;###autoload
-(defun guix-search-by-name (regexp &optional profile)
-  "Search for Guix packages matching REGEXP in a package name.
-If PROFILE is nil, use `guix-current-profile'.
-Interactively with prefix, prompt for PROFILE."
-  (interactive
-   (list (read-string "Package name by regexp: "
-                      nil 'guix-package-search-history)
-         (guix-ui-read-package-profile)))
-  (guix-search-by-regexp regexp '(name) profile))
-
-;;;###autoload
 (defun guix-installed-packages (&optional profile)
   "Display information about installed Guix packages.
 If PROFILE is nil, use `guix-current-profile'.

elisp/guix-ui-service-location.el

@@ -20,7 +20,7 @@
 ;;; Commentary:
 
 ;; This file provides a 'list' interface for displaying locations of
-;; GuixSD services.
+;; Guix System services.
 
 ;;; Code:
 

elisp/guix-ui-service.el

@@ -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: