On Fri, Apr 09 2021, Andrew Tropin wrote:

> For some reason upstream put bash package in a separate module, I find
> it a little bit inconsistent and do not reasons behind this descision,
> for now I decided to use shells module for bash and clarify with
> upstream why bash placed in separate module. WDYT?

Indeed, I think putting it in shells.scm makes more sense.

> Extensibility will be done later in a separate commit and will go
> directly to master.

Cool.

* gnu/home-services.scm (parent-directory, all-service-modules,
fold-home-service-types): New procedures.
* guix/scripts/home.scm (show-help): Add search section.
(service-type-name*, service-type-description-string,
%service-type-metrics, find-service-types, search): New procedures.
---
Most of the stuff has been copied or slightly modified from Guix
proper.  Run 'guix home search git', and enjoy! :)

 gnu/home-services.scm | 29 ++++++++++++++++++-
 guix/scripts/home.scm | 66 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/gnu/home-services.scm b/gnu/home-services.scm
[message trimmed]

Also, rename 'extra-config' fields to 'config', and update the example
config.

* gnu/home-services/xdg.scm (home-xdg-mime-applications-configuration):
Add 'actions' fields and rename 'extra-config' to 'config'.
(<xdg-desktop-action>): New record type.
---
 gnu/home-services/xdg.scm | 52 ++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/gnu/home-services/xdg.scm b/gnu/home-services/xdg.scm
index 481a363..02d146a 100644
--- a/gnu/home-services/xdg.scm
+++ b/gnu/home-services/xdg.scm
[message trimmed]

On Thu, Apr 08 2021, Andrew Tropin wrote:

>> +  (type xdg-desktop-entry-type)         ; xdg-desktop-type
>> +  (extra-config xdg-desktop-entry-type-extra-config ; alist
>> +                (default '())))
> There is no way to define sections other than [Desktop Entry].
> https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html#extra-actions

Oh, I should have put a TODO for that, sorry.

Add the 'alist?' predicate and refactor the relevant services.

* gnu/home-services-utils.scm (alist?): New procedure.
* gnu/home-services/gnupg.scm:
* gnu/home-services/ssh.scm:
* gnu/home-services/version-control.scm:
* gnu/home-services/xdg.scm:
---
 gnu/home-services-utils.scm           | 2 ++
 gnu/home-services/gnupg.scm           | 1 -
 gnu/home-services/ssh.scm             | 1 -
 gnu/home-services/version-control.scm | 1 -
 gnu/home-services/xdg.scm             | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)
[message trimmed]

And add example config.

* gnu/home-services/xdg.scm (home-xdg-mime-applications-extension):
New procedure.
---
 gnu/home-services/xdg.scm | 54 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/gnu/home-services/xdg.scm b/gnu/home-services/xdg.scm
index bbc9a7b..aca97fa 100644
--- a/gnu/home-services/xdg.scm
+++ b/gnu/home-services/xdg.scm
@@ -175,6 +175,26 @@ disable a directory, point it to the $HOME.")))
 ;;; XDG MIME applications.
[message trimmed]

Used records to configure XDG MIME applications to make it harder for
users to end up with an invalid config.  If one
key (e.g. 'inode/directory') is specified multiple times in the same
field (added, default, or removed), merge the values into a list of
values.

For example:

(home-xdg-mime-applications-configuration
  (default '((inode/directory . file.desktop)
             (inode/directory . emacs.desktop))))

results in:
[message trimmed]

* gnu/home-services/xdg.scm (xdg-desktop-types): New enumeration.
(xdg-desktop-type?, serialize-xdg-desktop-entry): New procedures.
(<xdg-desktop-entry>): New record type.
---
 gnu/home-services/xdg.scm | 69 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/gnu/home-services/xdg.scm b/gnu/home-services/xdg.scm
index d30eaec..0d1b147 100644
--- a/gnu/home-services/xdg.scm
+++ b/gnu/home-services/xdg.scm
@@ -5,15 +5,25 @@
   #:use-module (gnu home-services files)
   #:use-module (gnu home-services-utils)
[message trimmed]

* gnu/home-services-utils.scm (maybe-list): New procedure.
---
 gnu/home-services-utils.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/home-services-utils.scm b/gnu/home-services-utils.scm
index b109bec..db31356 100644
--- a/gnu/home-services-utils.scm
+++ b/gnu/home-services-utils.scm
@@ -29,7 +29,9 @@
 	    serialize-text-config
             symbol->snake-case
             ini-config?
-            generic-serialize-ini-config))
[message trimmed]

This updated patch series splits the changes into multiple commits and
includes some more refactoring.

Changes since v1:
- Remove duplicate check for 'home-xdg-mime-applications-configuration'.
- Refactor some bits.

Xinglu Chen (5):
  gnu: home-services-utils: Add 'maybe-list' procedure.
  gnu: home-services: xdg: Add <xdg-desktop-entry> record type.
  gnu: home-services: xdg: Use records instead of nested lists.
  gnu: home-services: xdg: Make XDG MIME service extendable.
  gnu: home-services-utils: Add 'alist?' predicate.