feat: major Calamares overhaul — dracut migration, branding polish, online/offline installer split
=== Calamares (core) === - Unskip packagechooserq from _skip_modules so it compiles in - pkgrel 2→3 === Calamares Branding === branding.desc: - Blue Antergos color scheme (#4A9EFF accent, #20252B sidebar) - New Antergos logo/icon PNGs from cnchi assets - Larger window (860x540) - Fix sidebar/navigation to widget mode stylesheet.qss: - Blue-themed QSS with gradients, styled buttons/inputs/sidebar show.qml: - 6-slide Calamares slideshow: welcome, EndeavourOS base, DE list, Antergos tools, finishing, thank-you (dark slide) dracut migration: - dracut.conf (NEW): initramfsName for dracut module compatibility - Remove mkinitcpio reference, dracut handles initramfs generation === Online/Offline Installer Split === Problem: unpackfs (GNOME squashfs) + netinstall (selected DE) installs two DEs — wasteful and messy. Solution: Two entirely separate Calamares configurations. settings_offline.conf (NEW): - Traditional unpackfs path, no netinstall steps - Installs GNOME from pre-built squashfs (current behavior) - Used by default `calamares` or via `calamares -c /etc/calamares-offline` settings_online.conf (NEW): - No unpackfs — everything installed from internet via netinstall - netinstall in both show (DE selection) and exec (package install) - Base system + Antergos packages as hidden/immutable groups - Used via `calamares -c /etc/calamares-online` netinstall.yaml (NEW): - Base System (hidden, immutable): kernel, base, firmware, network - Antergos Packages (hidden, immutable): wallpapers, welcome, yay, calamares - 8 Desktop Environments: KDE, GNOME, Xfce, Budgie, Cinnamon, MATE, LXQt, i3/Sway - Hardware Support group: GPU drivers, vulkan, pipewire netinstall.conf (NEW): groupsUrl pointing to netinstall.yaml welcome.conf (NEW): internet check (informational), 8GB storage/2GB RAM/power required calamares-next.sh (NEW): Launcher script — zenity/kdialog/dialog choice between Offline and Online, runs Calamares with the right config. Checks internet connectivity before starting online install. PKGBUILD install layout: - Branding shared at /usr/share/calamares/branding/antergos-next/ - Modules shared at /etc/calamares/modules/ - /etc/calamares-offline/ — settings.conf for offline - /etc/calamares-online/ — settings.conf for online - /etc/calamares/settings.conf → symlink to offline (default) - /usr/bin/calamares-next — launcher script === Antergos Welcome === PKGBUILD: copy data/preferences.json to package root (fixes runtime preferences loading in subdirectory layout)
This commit is contained in:
@@ -7,37 +7,224 @@ Presentation
|
||||
id: presentation
|
||||
|
||||
Timer {
|
||||
interval: 5000
|
||||
interval: 8000
|
||||
running: presentation.activatedInCalamares
|
||||
repeat: true
|
||||
onTriggered: presentation.goToNextSlide()
|
||||
}
|
||||
|
||||
Slide {
|
||||
anchors.fill: parent
|
||||
|
||||
Image {
|
||||
id: logo
|
||||
source: "antergos-logo.png"
|
||||
width: 320
|
||||
height: 92
|
||||
fillMode: Image.PreserveAspectFit
|
||||
anchors {
|
||||
centerIn: parent
|
||||
verticalCenterOffset: -40
|
||||
}
|
||||
}
|
||||
|
||||
Text {
|
||||
anchors.centerIn: parent
|
||||
anchors {
|
||||
top: logo.bottom
|
||||
topMargin: 20
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
text: "Welcome to Antergos NeXT"
|
||||
font.pixelSize: 24
|
||||
font.pixelSize: 22
|
||||
font.bold: true
|
||||
color: "#2a7ab5"
|
||||
color: "#4A9EFF"
|
||||
}
|
||||
|
||||
Text {
|
||||
anchors {
|
||||
top: parent.verticalCenter
|
||||
topMargin: 40
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
text: "A modern Arch Linux experience"
|
||||
font.pixelSize: 14
|
||||
color: "#7F8C8D"
|
||||
}
|
||||
}
|
||||
|
||||
Slide {
|
||||
Text {
|
||||
anchors.centerIn: parent
|
||||
text: "Installing Antergos NeXT..."
|
||||
font.pixelSize: 20
|
||||
color: "#333"
|
||||
anchors.fill: parent
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: "#F0F4F8"
|
||||
|
||||
Text {
|
||||
anchors {
|
||||
top: parent.top
|
||||
topMargin: 30
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
text: "Built on EndeavourOS"
|
||||
font.pixelSize: 20
|
||||
font.bold: true
|
||||
color: "#2C3E50"
|
||||
}
|
||||
|
||||
Column {
|
||||
anchors {
|
||||
centerIn: parent
|
||||
verticalCenterOffset: 10
|
||||
}
|
||||
spacing: 12
|
||||
|
||||
Text { text: "• EndeavourOS base — stable, rolling" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• dracut initramfs — fast, reliable" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• systemd — modern init system" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• Latest Linux kernel and drivers" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• Arch User Repository (AUR) access" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Slide {
|
||||
anchors.fill: parent
|
||||
|
||||
Text {
|
||||
anchors.centerIn: parent
|
||||
text: "Almost done!"
|
||||
anchors {
|
||||
top: parent.top
|
||||
topMargin: 30
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
text: "Desktop Environments"
|
||||
font.pixelSize: 20
|
||||
color: "#333"
|
||||
font.bold: true
|
||||
color: "#2C3E50"
|
||||
}
|
||||
|
||||
Column {
|
||||
anchors {
|
||||
centerIn: parent
|
||||
verticalCenterOffset: 10
|
||||
}
|
||||
spacing: 12
|
||||
|
||||
Text { text: "• KDE Plasma — full-featured, customizable" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• GNOME — modern, streamlined" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• Xfce — lightweight, classic" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• Budgie — elegant, simple" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• i3/ Sway — tiling window managers" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
}
|
||||
}
|
||||
|
||||
Slide {
|
||||
anchors.fill: parent
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: "#F0F4F8"
|
||||
|
||||
Text {
|
||||
anchors {
|
||||
top: parent.top
|
||||
topMargin: 30
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
text: "Antergos Tools"
|
||||
font.pixelSize: 20
|
||||
font.bold: true
|
||||
color: "#2C3E50"
|
||||
}
|
||||
|
||||
Column {
|
||||
anchors {
|
||||
centerIn: parent
|
||||
verticalCenterOffset: 10
|
||||
}
|
||||
spacing: 12
|
||||
|
||||
Text { text: "• Welcome app — system info & quick config" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• Calamares installer — easy setup" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• Cnchi — classic Antergos installer" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• Pacman + AUR helper — full package access" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
Text { text: "• Online documentation and community" ; font.pixelSize: 13 ; color: "#34495E" }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Slide {
|
||||
anchors.fill: parent
|
||||
|
||||
Text {
|
||||
anchors {
|
||||
top: parent.top
|
||||
topMargin: 60
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
text: "Finishing Installation..."
|
||||
font.pixelSize: 22
|
||||
font.bold: true
|
||||
color: "#4A9EFF"
|
||||
}
|
||||
|
||||
Image {
|
||||
source: "antergos-icon.png"
|
||||
width: 96
|
||||
height: 96
|
||||
fillMode: Image.PreserveAspectFit
|
||||
anchors {
|
||||
centerIn: parent
|
||||
verticalCenterOffset: 10
|
||||
}
|
||||
}
|
||||
|
||||
Text {
|
||||
anchors {
|
||||
bottom: parent.bottom
|
||||
bottomMargin: 40
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
text: "Almost there — your system is being configured"
|
||||
font.pixelSize: 13
|
||||
color: "#7F8C8D"
|
||||
}
|
||||
}
|
||||
|
||||
Slide {
|
||||
anchors.fill: parent
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: "#20252B"
|
||||
|
||||
Text {
|
||||
anchors {
|
||||
centerIn: parent
|
||||
verticalCenterOffset: -30
|
||||
}
|
||||
text: "Thank You!"
|
||||
font.pixelSize: 28
|
||||
font.bold: true
|
||||
color: "#4A9EFF"
|
||||
}
|
||||
|
||||
Text {
|
||||
anchors {
|
||||
top: parent.verticalCenter
|
||||
topMargin: 10
|
||||
horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
text: "Antergos NeXT is ready.<br/>Reboot and enjoy!"
|
||||
font.pixelSize: 14
|
||||
color: "#C8D6E5"
|
||||
horizontalAlignment: Text.Center
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function onActivate() {
|
||||
presentation.currentSlide = 0
|
||||
}
|
||||
|
||||
function onLeave() {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user