From fff260cd522e808261caea7010dc92dce2e1870d Mon Sep 17 00:00:00 2001 From: Celestia Ludenberg Date: Mon, 29 Jun 2026 21:28:18 +0200 Subject: [PATCH] fix: update branding package with correct DE list, initcpio, and launcher fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit calamares-branding-antergos-next (pkgrel 19): - calamares-next.sh: fix SetConfig() symlink clobber — rm symlink before cp so config is written as standalone file - show.qml: remove squished logo slider, clean background overlay layout, remove Budgie references - settings_offline.conf: dracut/dracutlukscfg -> initcpiocfg/initcpio/ luksopenswaphookcfg; services-openrc -> services-artix; removeuser -> postcfg - settings_online.conf: same initcpio/service fixes; netinstall -> packagechooser + unpackfs; remove removeuser - packagechooser.conf: full DE selector with valid Artix groups (Plasma, Xfce, Cinnamon, MATE, LXQt, i3, Sway, Hyprland) + No Desktop option --- .../calamares-branding-antergos-next/PKGBUILD | 2 +- .../calamares-next.sh | 2 + .../packagechooser.conf | 63 ++++++--- .../settings_offline.conf | 68 +++++----- .../settings_online.conf | 71 +++++----- .../calamares-branding-antergos-next/show.qml | 123 +++++++----------- 6 files changed, 174 insertions(+), 155 deletions(-) diff --git a/packages/calamares-branding-antergos-next/PKGBUILD b/packages/calamares-branding-antergos-next/PKGBUILD index 2c19b99..6586191 100644 --- a/packages/calamares-branding-antergos-next/PKGBUILD +++ b/packages/calamares-branding-antergos-next/PKGBUILD @@ -2,7 +2,7 @@ pkgname=calamares-branding-antergos-next pkgver=1.0 -pkgrel=17 +pkgrel=19 pkgdesc="Calamares branding for Antergos NeXT with offline/online installer support" arch=('any') url="https://github.com/Antergos-NeXT" diff --git a/packages/calamares-branding-antergos-next/calamares-next.sh b/packages/calamares-branding-antergos-next/calamares-next.sh index 42ef75f..22ef4c9 100644 --- a/packages/calamares-branding-antergos-next/calamares-next.sh +++ b/packages/calamares-branding-antergos-next/calamares-next.sh @@ -140,10 +140,12 @@ InstallWithLogs() { SetConfig() { case "$mode" in online) + sudo rm -f "/etc/calamares/settings.conf" sudo cp "/etc/calamares-online/settings.conf" "/etc/calamares/settings.conf" PreLog "Using online settings" ;; offline) + sudo rm -f "/etc/calamares/settings.conf" sudo cp "/etc/calamares-offline/settings.conf" "/etc/calamares/settings.conf" PreLog "Using offline settings" ;; diff --git a/packages/calamares-branding-antergos-next/packagechooser.conf b/packages/calamares-branding-antergos-next/packagechooser.conf index ba25d7f..15ad7c2 100644 --- a/packages/calamares-branding-antergos-next/packagechooser.conf +++ b/packages/calamares-branding-antergos-next/packagechooser.conf @@ -1,22 +1,55 @@ -# SPDX-FileCopyrightText: no -# SPDX-License-Identifier: CC0-1.0 --- mode: required method: legacy labels: - step: "Packages" + step: "Desktop Environment" 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 + description: "Install without a desktop environment — not recommended. You'll only get a TTY; screen recording won't work without a capture card." + - id: plasma + packages: [ plasma ] + name: "Plasma" + description: "KDE Plasma Desktop — modern, feature-rich, highly customizable" + - id: xfce + packages: [ xfce4, xfce4-goodies ] + name: "Xfce" + description: "Xfce — lightweight, classic desktop" + - id: cinnamon + packages: + - cinnamon + - cinnamon-control-center + - cinnamon-desktop + - cinnamon-menus + - cinnamon-screensaver + - cinnamon-session + - cinnamon-settings-daemon + - cinnamon-translations + name: "Cinnamon" + description: "Cinnamon — traditional desktop with modern conventions" + - id: mate + packages: [ mate, mate-extra ] + name: "MATE" + description: "MATE — continuation of GNOME 2" + - id: lxqt + packages: [ lxqt ] + name: "LXQt" + description: "LXQt — lightweight Qt desktop" + - id: i3 + packages: [ i3 ] + name: "i3" + description: "i3 — tiling window manager" + - id: sway + packages: + - sway + - swaybg + - swayidle + - swaylock + name: "Sway" + description: "Sway — i3-compatible Wayland compositor" + - id: hyprland + packages: + - hyprland + - xdg-desktop-portal-hyprland + name: "Hyprland" + description: "Hyprland — dynamic tiling Wayland compositor" diff --git a/packages/calamares-branding-antergos-next/settings_offline.conf b/packages/calamares-branding-antergos-next/settings_offline.conf index 37d476a..72481ce 100644 --- a/packages/calamares-branding-antergos-next/settings_offline.conf +++ b/packages/calamares-branding-antergos-next/settings_offline.conf @@ -2,44 +2,50 @@ modules-search: [ /usr/lib/calamares/modules, /etc/calamares/modules ] sequence: -- show: - - welcome - - locale - - keyboard - - partition - - users - - summary -- exec: - - partition - - mount - - unpackfs - - machineid - - fstab - - locale - - keyboard - - localecfg - - luksbootkeyfile - - dracutlukscfg - - dracut - - users - - displaymanager - - networkcfg - - hwclock - - services-openrc - - grubcfg - - bootloader - - packages - - removeuser - - umount -- show: - - finished + - show: + - welcome + - locale + - keyboard + - partition + - users + - summary + - exec: + - partition + - mount + - unpackfs + - machineid + - fstab + - locale + - keyboard + - localecfg + - luksopenswaphookcfg + - luksbootkeyfile + - initcpiocfg + - initcpio + - users + - displaymanager + - networkcfg + - hwclock + - services-artix + - grubcfg + - bootloader + - postcfg + - umount + - show: + - finished branding: antergos-next prompt-install: false + dont-chroot: false + oem-setup: false + disable-cancel: false + disable-cancel-during-exec: false + hide-back-and-next-during-exec: false + quit-at-end: false diff --git a/packages/calamares-branding-antergos-next/settings_online.conf b/packages/calamares-branding-antergos-next/settings_online.conf index 32509b0..a3a0536 100644 --- a/packages/calamares-branding-antergos-next/settings_online.conf +++ b/packages/calamares-branding-antergos-next/settings_online.conf @@ -2,44 +2,53 @@ modules-search: [ /usr/lib/calamares/modules, /etc/calamares/modules ] sequence: -- show: - - welcome - - locale - - keyboard - - netinstall - - partition - - users - - summary -- exec: - - partition - - mount - - netinstall - - machineid - - fstab - - locale - - keyboard - - localecfg - - luksbootkeyfile - - dracutlukscfg - - dracut - - users - - displaymanager - - networkcfg - - hwclock - - services-openrc - - grubcfg - - bootloader - - removeuser - - umount -- show: - - finished + - show: + - welcome + - locale + - keyboard + - packagechooser + - netinstall + - partition + - users + - summary + - exec: + - partition + - mount + - basestrap + - machineid + - packages + - fstab + - locale + - keyboard + - localecfg + - luksopenswaphookcfg + - luksbootkeyfile + - initcpiocfg + - initcpio + - users + - displaymanager + - networkcfg + - hwclock + - services-artix + - grubcfg + - bootloader + - postcfg + - umount + - show: + - finished branding: antergos-next prompt-install: false + dont-chroot: false + oem-setup: false + disable-cancel: false + disable-cancel-during-exec: false + hide-back-and-next-during-exec: false + quit-at-end: false diff --git a/packages/calamares-branding-antergos-next/show.qml b/packages/calamares-branding-antergos-next/show.qml index 7ded039..be2977a 100644 --- a/packages/calamares-branding-antergos-next/show.qml +++ b/packages/calamares-branding-antergos-next/show.qml @@ -7,7 +7,6 @@ Item { console.log("Slideshow) activated"); timer.restart(); slider.reset(); - img.reset(); } function onLeave(){ @@ -22,7 +21,7 @@ Item { interval: 10000 running: true repeat: true - onTriggered: slider.currentSlideIndex++,img.currentSlideIndex++ + onTriggered: slider.currentSlideIndex++ } MouseArea { @@ -30,89 +29,59 @@ Item { onClicked: { timer.restart(); slider.currentSlideIndex++; - img.currentSlideIndex++; } } - Item { + Image { + id: background anchors.fill: parent - Image { - id: background + source: "background.jpg" + fillMode: Image.PreserveAspectCrop + } + + Rectangle { + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + } + height: 200 + color: Qt.rgba(0, 0, 0, 0.6) + + Slider { + id: slider anchors { fill: parent - margins: -10 - bottomMargin: 0 + margins: 20 } - source: "background.jpg" - sourceSize.width: width - sourceSize.height: height - } - - } - - Slider { - id: slider - height: 50 - - slides: [ - Dia { - title: qsTr("Welcome to Antergos NeXT") - body: qsTr("A modern Arch Linux experience with OpenRC and elogind") - footer: qsTr("Choose your preferred desktop environment during setup") - }, - Dia { - title: qsTr("Desktop Environments") - 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 { - title: qsTr("Antergos Tools") - body: qsTr("Welcome app for system configuration, Calamares installer with offline and online modes, and HAL package manager") - footer: qsTr("Full access to Arch Linux repositories and the AUR") - }, - Dia { - title: qsTr("Open Source") - body: qsTr("Antergos NeXT is free and open source software built by the community") - footer: qsTr("Contribute on GitHub — Antergos-NeXT") - }, - Dia { - title: qsTr("Almost Done") - body: qsTr("Your system is being configured with your selected options") - footer: qsTr("Reboot and enjoy Antergos NeXT") - } - ] - anchors { - centerIn: parent - horizontalCenterOffset: 50 - verticalCenterOffset: 10 - } - } - Slider { - id: img - height: 50 - - slides: [ - Dia { - image: "antergos-logo.png" - }, - Dia { - image: "antergos-logo.png" - }, - Dia { - image: "antergos-logo.png" - }, - Dia { - image: "antergos-logo.png" - }, - Dia { - image: "antergos-logo.png" - } - ] - anchors { - centerIn: parent - horizontalCenterOffset: -400 - verticalCenterOffset: -100 + slides: [ + Dia { + title: qsTr("Welcome to Antergos NeXT") + body: qsTr("A modern Arch Linux experience with OpenRC and elogind") + footer: qsTr("Choose your preferred desktop environment during setup") + }, + Dia { + title: qsTr("Desktop Environments") + body: qsTr("Select from KDE Plasma, Xfce, Cinnamon, MATE, LXQt, i3, Sway, or Hyprland") + footer: qsTr("Each desktop is fully configured and ready to use") + }, + Dia { + title: qsTr("Antergos Tools") + body: qsTr("Welcome app for system configuration, Calamares installer with offline and online modes, and HAL package manager") + footer: qsTr("Full access to Arch Linux repositories and the AUR") + }, + Dia { + title: qsTr("Open Source") + body: qsTr("Antergos NeXT is free and open source software built by the community") + footer: qsTr("Contribute on GitHub — Antergos-NeXT") + }, + Dia { + title: qsTr("Almost Done") + body: qsTr("Your system is being configured with your selected options") + footer: qsTr("Reboot and enjoy Antergos NeXT") + } + ] } } }