From e0bb2acea47da2001477af775586b3536e05edc0 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Thu, 1 Feb 2024 08:49:59 +0100
Subject: Reform package installation

---
 systems/izumi/izumi.org | 56 +++++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 35 deletions(-)

(limited to 'systems/izumi/izumi.org')

diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index 28e713f..5510e8b 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -725,47 +725,33 @@
   (use-modules
    ( channels )
    (gnu home)
-   (gnu home services shells)
-   (gnu packages)
-   (gnu packages compression)
-   (gnu packages emacs)
-   (gnu packages fonts)
-   (gnu packages gnome)
-   (gnu packages gnupg)
-   (gnu packages noweb)
-   (gnu packages version-control)
-   (nongnu packages mozilla))
+   (gnu home services shells))
 
   <<EMACS-GUIX-MODULES>>
   <<EMACS-ORG-FC-TN-MODULES>>
   <<ESSENTIAL-HOME-MODULES>>
   <<SHELLS-MODULES>>
 
-  (home-environment
-   (packages
-    (list
-     dconf-editor
-     emacs
-     emacs-org-modern
-     emacs-paredit
-     firefox
-     font-google-noto
-     font-google-noto-emoji
-     font-google-noto-sans-cjk
-     font-google-noto-serif-cjk
-     git
-     gnupg
-     gnome-tweaks
-     noweb
-     pinentry
-     pwgen
-     unzip
-     zip))
-   (services
-    (append
-     ( list izumi-channels-service-type )
-     <<ESSENTIAL-HOME-SERVICES>>
-     <<SHELLS>>)))
+  (home-environment (packages (map specification->package+output
+                                   (list "dconf-editor"
+                                         "emacs"
+                                         "emacs-org-modern"
+                                         "emacs-paredit"
+                                         "font-google-noto"
+                                         "font-google-noto-emoji"
+                                         "font-google-noto-sans-cjk"
+                                         "font-google-noto-serif-cjk"
+                                         "git"
+                                         "gnupg"
+                                         "gnome-tweaks"
+                                         "noweb"
+                                         "pinentry"
+                                         "pwgen"
+                                         "unzip"
+                                         "zip")))
+                    (services (append (list izumi-channels-service-type)
+                                      <<ESSENTIAL-HOME-SERVICES>>
+                                      <<SHELLS>>)))
 #+END_SRC
 
 ** [[https://guix.gnu.org/manual/en/html_node/Home-Services.html][13.3 Home Services]]
-- 
cgit v1.2.3