fix: remove GNOME from DE chooser, replace dracut with mkinitcpio, add packagechooser without GNOME

packages/calamares-branding-antergos-next/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=calamares-branding-antergos-next
 pkgver=1.0
-pkgrel=16
+pkgrel=17
 pkgdesc="Calamares branding for Antergos NeXT with offline/online installer support"
 arch=('any')
 url="https://github.com/Antergos-NeXT"
@@ -21,13 +21,15 @@ source=("branding.desc"
         "pan-end-symbolic.svg"
         "pan-start-symbolic.svg"
         "draw-rectangle.svg"
-        "unpackfs.conf"
+         "unpackfs.conf"
-        "dracut.conf"
+         "initcpiocfg.conf"
+         "initcpio.conf"
         "antergos-logo.png"
         "antergos-icon.png"
         "netinstall.yaml"
-        "netinstall.conf"
+         "netinstall.conf"
-        "welcome.conf"
+         "packagechooser.conf"
+         "welcome.conf"
         "settings_offline.conf"
         "settings_online.conf"
         "calamares-next.sh")
@@ -51,8 +53,9 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
+             'SKIP'
-            'SKIP')
+             'SKIP'
+             'SKIP')
 
 package() {
   # Branding data (shared between offline/online)
@@ -93,9 +96,11 @@ package() {
   # Shared Calamares modules
   install -dm755 "${pkgdir}/etc/calamares/modules"
   cp "unpackfs.conf" "${pkgdir}/etc/calamares/modules/"
-  cp "dracut.conf" "${pkgdir}/etc/calamares/modules/"
+  cp "initcpiocfg.conf" "${pkgdir}/etc/calamares/modules/"
+  cp "initcpio.conf" "${pkgdir}/etc/calamares/modules/"
   cp "netinstall.conf" "${pkgdir}/etc/calamares/modules/"
   cp "netinstall.yaml" "${pkgdir}/etc/calamares/modules/"
+  cp "packagechooser.conf" "${pkgdir}/etc/calamares/modules/"
   cp "welcome.conf" "${pkgdir}/etc/calamares/modules/"
 
   # Offline config directory

packages/calamares-branding-antergos-next/dracut.conf

@@ -1,10 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# Run dracut(8) for the installed kernel
----
-# Specify the output initramfs filename (default: initramfs-<kernel-version>.img)
-initramfsName: /boot/initramfs-linux.img
-
-# Optional arguments to dracut; -f is always implied
-options: [ "-f" ]

packages/calamares-branding-antergos-next/initcpio.conf

@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+---
+kernel: linux
+be_unsafe: false

packages/calamares-branding-antergos-next/initcpiocfg.conf

@@ -0,0 +1,5 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+---
+useSystemdHook: false
+source: "/etc/mkinitcpio.conf"

packages/calamares-branding-antergos-next/packagechooser.conf

@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+---
+mode: required
+method: legacy
+labels:
+    step: "Packages"
+items:
+    - id: ""
+      name: "No Desktop"
+      description: "Please pick a desktop environment from the list."
+      screenshot: ":/images/no-selection.png"
+    - id: kde
+      packages: [ kde-frameworks, kde-plasma, kde-gear ]
+      name: Plasma Desktop
+      description: "KDE Plasma Desktop, simple by default."
+      screenshot: ":/images/kde.png"
+    - id: calamares
+      appdata: ../io.calamares.calamares.appdata.xml
+      screenshot: ":/images/calamares.png"
+    - id: kate
+      appstream: org.kde.kwrite.desktop

packages/calamares-branding-antergos-next/show.qml

@@ -63,7 +63,7 @@ Item {
             },
             Dia {
                 title: qsTr("Desktop Environments")
-                body: qsTr("Select from KDE Plasma, GNOME, Xfce, Budgie, Cinnamon, MATE, LXQt, or i3/Sway")
+                body: qsTr("Select from KDE Plasma, Xfce, Budgie, Cinnamon, MATE, LXQt, or i3/Sway")
                 footer: qsTr("Each desktop is fully configured and ready to use")
             },
             Dia {

packages/calamares/PKGBUILD

@@ -5,7 +5,7 @@
 _pkgname="calamares"
 pkgname="$_pkgname"
 pkgver=3.4.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Distribution-independent installer framework"
 url="https://codeberg.org/Calamares/calamares"
 license=("GPL-3.0-or-later")
@@ -37,6 +37,7 @@ build() {
     dummyprocess
     dummypython
     dummypythonqt
+    dracut
     initramfs
     initramfscfg
     interactiveterminal