From 9eb58fe064858f7ad1ff4b715fc0ec986e1726f0 Mon Sep 17 00:00:00 2001
From: Basti Lathe <sebastian@spaeth.biz>
Date: Tue, 23 May 2023 18:21:54 +0200
Subject: [PATCH] mkinitcpio and packages update

---
 presets/xfce-branding.toml | 2 +-
 presets/xfce-goodies.toml  | 2 +-
 src/constants.rs           | 2 ++
 src/main.rs                | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/presets/xfce-branding.toml b/presets/xfce-branding.toml
index 5f636c8..36ff780 100644
--- a/presets/xfce-branding.toml
+++ b/presets/xfce-branding.toml
@@ -1,4 +1,4 @@
-packages = ["manjaro-xfce-settings", "manjaro-hello", "manjaro-application-utility", "manjaro-settings-manager-notifier", "manjaro-documentation-en", "manjaro-browser-settings", "manjaro-release", "manjaro-firmware", "manjaro-system"]
+packages = ["manjaro-xfce-settings", "manjaro-hello", "manjaro-application-utility", "manjaro-settings-manager-notifier", "manjaro-browser-settings", "manjaro-release", "manjaro-pipewire", "manjaro-system"]
 script = """
 cp /shared_dirs/xfce-branding/lightdm-gtk-greeter.conf /etc/lightdm/lightdm-gtk-greeter.conf
 """
diff --git a/presets/xfce-goodies.toml b/presets/xfce-goodies.toml
index e8c250e..4ece593 100644
--- a/presets/xfce-goodies.toml
+++ b/presets/xfce-goodies.toml
@@ -1,2 +1,2 @@
-packages = ["xfce4-goodies", "xfce4-pulseaudio-plugin", "pulseaudio", "pavucontrol", "mugshot", "engrampa", "catfish", "firefox", "screenfetch", "thunderbird", "network-manager-applet"]
+packages = ["xfce4-goodies", "xfce4-pulseaudio-plugin", "pipewire", "pavucontrol", "mugshot", "engrampa", "catfish", "firefox", "screenfetch", "thunderbird", "network-manager-applet"]
 
diff --git a/src/constants.rs b/src/constants.rs
index 993783b..9617f07 100644
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -10,7 +10,9 @@ SystemMaxUse=16M
 pub const BASE_PACKAGES: [&str; 9] = [
     "base",
     "linux515",
+    "linux61",
     "linux515-broadcom-wl",
+    "linux61-broadcom-wl",
     "linux-firmware",
     "grub",
     "efibootmgr",
diff --git a/src/main.rs b/src/main.rs
index 8d3298a..738061c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -433,7 +433,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
     arch_chroot
         .execute()
         .arg(mount_point.path())
-        .args(&["mkinitcpio", "-P"])
+        .args(&["mkinitcpio", "-p linux61 linux515"])
         .run()
         .context("Failed to run mkinitcpio - do you have the base and linux packages installed?")?;