From 36d84bf01dadbcf3a02bf0a1936a3a585686e518 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Mon, 18 Dec 2023 19:31:02 +0100
Subject: [PATCH] .

---
 config.org                  |   2 +-
 home/home-configuration.scm | 121 ++++++++++++++++++------------------
 sysinst.sh                  |   2 +-
 3 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/config.org b/config.org
index dda29c1..dab990e 100644
--- a/config.org
+++ b/config.org
@@ -31,7 +31,7 @@ This is to be run after setting up the partitions.
   mount /dev/disk/by-label/EFI /mnt/boot/efi
   herd start cow-store /mnt
   guix pull -C./channels.scm
-  $GUIX_PROFILE="/root/.config/guix/current"
+  GUIX_PROFILE="/root/.config/guix/current"
   . "$GUIX_PROFILE/etc/profile"
   hash guix
   guix system -L. init config.scm /mnt --substitute-urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org"
diff --git a/home/home-configuration.scm b/home/home-configuration.scm
index aeceddb..6bb0f34 100644
--- a/home/home-configuration.scm
+++ b/home/home-configuration.scm
@@ -24,67 +24,6 @@
  (gnu home services ssh))
 
 (home-environment
- ;; Below is the list of packages that will show up in your
- ;; Home profile, under ~/.guix-home/profile.
- (packages
-  (specifications->packages
-   (list "bsd-games"
-         "bolt"
-         "browserpass-native"
-         "chicken"
-         "chicken-apropos"
-         "chicken-chicken-doc"
-         "chicken-srfi-18"
-         "curl"
-         "direnv"
-	 "emacs-pgtk-xwidgets"
-         "entr"
-         "eternalterminal"
-         "diff-so-fancy"
-         "firefox"
-         "flatpak"
-         "font-libertinus"
-         "font-nerdfont-monaspice"
-         "fuzzel"
-         "fzf"
-         "gammastep"
-         "grim"
-	 "guile"
-	 "glibc-locales"
-         "hstr"
-         "icecat"
-         "icedove-wayland"
-         "kitty"
-         "ksshaskpass"
-         "make"
-         "nm-tray"
-         "nnn"
-         #;"nss-certs" ; This package is broken
-         "openssh"
-         "password-store"
-         "pass-otp"
-         "passff-icecat"
-         "pavucontrol"
-         "pinentry-qt"
-         "pipewire"
-         "pv"
-         "rsync"
-         "rust"
-         "rust-cargo"
-         "senpai"
-         "sideload"
-         "slurp"
-         ;; "sponge" https://linux.die.net/man/1/sponge
-         "swappy"
-	 "swayfx"
-         "swayidle"
-         "swaylock-effects"
-         "tig"
-         "unzip"
-         "visidata"
-         "waybar"
-         "wlogout"
-         "xdg-desktop-portal")))
  ;; Below is the list of Home services.  To search for available
  ;; services, run 'guix home search KEYWORD' in a terminal.
  (services
@@ -180,6 +119,66 @@
                     (channel
                      (name 'nongnu-guix)
                      (url "https://gitlab.com/nonguix/nonguix"))))
+   (simple-service 'ziltis-packages
+                   home-profile-service-type
+                   (specifications->packages
+                    (list "bsd-games"
+                          "bolt"
+                          "browserpass-native"
+                          "chicken"
+                          "chicken-apropos"
+                          "chicken-chicken-doc"
+                          "chicken-srfi-18"
+                          "curl"
+                          "direnv"
+                          "emacs-pgtk-xwidgets"
+                          "entr"
+                          "eternalterminal"
+                          "diff-so-fancy"
+                          "firefox"
+                          "flatpak"
+                          "font-libertinus"
+                          "font-nerdfont-monaspice"
+                          "fuzzel"
+                          "fzf"
+                          "gammastep"
+                          "grim"
+                          "guile"
+                          "glibc-locales"
+                          "hstr"
+                          "icecat"
+                          "icedove-wayland"
+                          "kitty"
+                          "ksshaskpass"
+                          "make"
+                          "nm-tray"
+                          "nnn"
+                          #;"nss-certs" ; This package is broken
+                          "openssh"
+                          "password-store"
+                          "pass-otp"
+                          "passff-icecat"
+                          "pavucontrol"
+                          "pinentry-qt"
+                          "pipewire"
+                          "pv"
+                          "rsync"
+                          "rust"
+                          "rust-cargo"
+                          "senpai"
+                          "sideload"
+                          "slurp"
+                          ;; "sponge" https://linux.die.net/man/1/sponge
+                          "swappy"
+                          "swayfx"
+                          "swayidle"
+                          "swaylock-effects"
+                          "tig"
+                          "unzip"
+                          "visidata"
+                          "waybar"
+                          "wlogout"
+                          "xdg-desktop-portal")))
    (service home-openssh-service-type
             (home-openssh-configuration
              (hosts
diff --git a/sysinst.sh b/sysinst.sh
index a3562bf..4b07a97 100644
--- a/sysinst.sh
+++ b/sysinst.sh
@@ -5,7 +5,7 @@ mkdir -p /mnt/boot/efi
 mount /dev/disk/by-label/EFI /mnt/boot/efi
 herd start cow-store /mnt
 guix pull -C./channels.scm
-$GUIX_PROFILE="/root/.config/guix/current"
+GUIX_PROFILE="/root/.config/guix/current"
 . "$GUIX_PROFILE/etc/profile"
 hash guix
 guix system -L. init config.scm /mnt --substitute-urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org"