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:
@@ -25,6 +25,7 @@ package() {
|
|||||||
|
|
||||||
cp -r src "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
cp -r src "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
||||||
cp -r data "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
cp -r data "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
||||||
|
cp data/preferences.json "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
||||||
cp -r ui "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
cp -r ui "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
||||||
cp -r po "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
cp -r po "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
||||||
cp -r utils "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
cp -r utils "${pkgdir}/usr/share/antergos-next/antergos-welcome/"
|
||||||
|
|||||||
@@ -2,76 +2,71 @@
|
|||||||
|
|
||||||
pkgname=calamares-branding-antergos-next
|
pkgname=calamares-branding-antergos-next
|
||||||
pkgver=1.0
|
pkgver=1.0
|
||||||
pkgrel=2
|
pkgrel=5
|
||||||
pkgdesc="Minimal Calamares branding for Antergos NeXT"
|
pkgdesc="Calamares branding for Antergos NeXT with offline/online installer support"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url="https://github.com/Antergos-NeXT"
|
url="https://github.com/Antergos-NeXT"
|
||||||
license=('GPL3')
|
license=('GPL3')
|
||||||
depends=('calamares')
|
depends=('calamares')
|
||||||
|
optdepends=('zenity: graphical mode chooser dialog')
|
||||||
source=("branding.desc"
|
source=("branding.desc"
|
||||||
"stylesheet.qss"
|
"stylesheet.qss"
|
||||||
"show.qml")
|
"show.qml"
|
||||||
|
"unpackfs.conf"
|
||||||
|
"dracut.conf"
|
||||||
|
"antergos-logo.png"
|
||||||
|
"antergos-icon.png"
|
||||||
|
"netinstall.yaml"
|
||||||
|
"netinstall.conf"
|
||||||
|
"welcome.conf"
|
||||||
|
"settings_offline.conf"
|
||||||
|
"settings_online.conf"
|
||||||
|
"calamares-next.sh")
|
||||||
sha256sums=('SKIP'
|
sha256sums=('SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'SKIP')
|
'SKIP')
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
|
# Branding data (shared between offline/online)
|
||||||
local _brand="/usr/share/calamares/branding/antergos-next"
|
local _brand="/usr/share/calamares/branding/antergos-next"
|
||||||
install -dm755 "${pkgdir}${_brand}"
|
install -dm755 "${pkgdir}${_brand}"
|
||||||
|
|
||||||
cp "branding.desc" "${pkgdir}${_brand}/"
|
cp "branding.desc" "${pkgdir}${_brand}/"
|
||||||
cp "stylesheet.qss" "${pkgdir}${_brand}/"
|
cp "stylesheet.qss" "${pkgdir}${_brand}/"
|
||||||
cp "show.qml" "${pkgdir}${_brand}/"
|
cp "show.qml" "${pkgdir}${_brand}/"
|
||||||
|
cp "antergos-logo.png" "${pkgdir}${_brand}/"
|
||||||
|
cp "antergos-icon.png" "${pkgdir}${_brand}/"
|
||||||
|
|
||||||
# Symlink Antergos logo from cnchi or wallpapers
|
# Shared Calamares modules
|
||||||
# Use antergos-icon from system if available
|
install -dm755 "${pkgdir}/etc/calamares/modules"
|
||||||
|
cp "unpackfs.conf" "${pkgdir}/etc/calamares/modules/"
|
||||||
|
cp "dracut.conf" "${pkgdir}/etc/calamares/modules/"
|
||||||
|
cp "netinstall.conf" "${pkgdir}/etc/calamares/modules/"
|
||||||
|
cp "netinstall.yaml" "${pkgdir}/etc/calamares/modules/"
|
||||||
|
cp "welcome.conf" "${pkgdir}/etc/calamares/modules/"
|
||||||
|
|
||||||
|
# Offline config directory
|
||||||
|
install -dm755 "${pkgdir}/etc/calamares-offline"
|
||||||
|
cp "settings_offline.conf" "${pkgdir}/etc/calamares-offline/settings.conf"
|
||||||
|
|
||||||
|
# Online config directory
|
||||||
|
install -dm755 "${pkgdir}/etc/calamares-online"
|
||||||
|
cp "settings_online.conf" "${pkgdir}/etc/calamares-online/settings.conf"
|
||||||
|
|
||||||
|
# Default: offline mode (for direct calamares launch)
|
||||||
install -dm755 "${pkgdir}/etc/calamares"
|
install -dm755 "${pkgdir}/etc/calamares"
|
||||||
cat > "${pkgdir}/etc/calamares/settings.conf" << 'CONF'
|
ln -sf "../calamares-offline/settings.conf" "${pkgdir}/etc/calamares/settings.conf"
|
||||||
---
|
|
||||||
modules-search: [ local ]
|
|
||||||
|
|
||||||
sequence:
|
# Launcher script
|
||||||
- show:
|
install -dm755 "${pkgdir}/usr/bin"
|
||||||
- welcome
|
install -m755 "calamares-next.sh" "${pkgdir}/usr/bin/calamares-next"
|
||||||
- locale
|
|
||||||
- keyboard
|
|
||||||
- partition
|
|
||||||
- users
|
|
||||||
- summary
|
|
||||||
- exec:
|
|
||||||
- partition
|
|
||||||
- mount
|
|
||||||
- unpackfs
|
|
||||||
- machineid
|
|
||||||
- fstab
|
|
||||||
- locale
|
|
||||||
- keyboard
|
|
||||||
- localecfg
|
|
||||||
- luksbootkeyfile
|
|
||||||
- luksopenswaphookcfg
|
|
||||||
- initcpiocfg
|
|
||||||
- initcpio
|
|
||||||
- users
|
|
||||||
- displaymanager
|
|
||||||
- networkcfg
|
|
||||||
- hwclock
|
|
||||||
- services-systemd
|
|
||||||
- grubcfg
|
|
||||||
- bootloader
|
|
||||||
- packages
|
|
||||||
- removeuser
|
|
||||||
- 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
|
|
||||||
CONF
|
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
@@ -4,19 +4,38 @@ componentName: antergos-next
|
|||||||
welcomeStyleCalamares: false
|
welcomeStyleCalamares: false
|
||||||
welcomeExpandingLogo: true
|
welcomeExpandingLogo: true
|
||||||
|
|
||||||
productName: Antergos NeXT
|
windowExpanding: normal
|
||||||
shortProductName: Antergos NeXT
|
windowSize: 860px,540px
|
||||||
version: rolling
|
windowPlacement: center
|
||||||
shortVersion: rolling
|
|
||||||
versionedName: Antergos NeXT rolling
|
|
||||||
|
|
||||||
bootloaderEntryName: Antergos NeXT
|
sidebar: widget
|
||||||
|
navigation: widget
|
||||||
|
|
||||||
productUrl: https://github.com/Antergos-NeXT
|
strings:
|
||||||
supportUrl: https://github.com/Antergos-NeXT
|
productName: "Antergos NeXT"
|
||||||
knownIssuesUrl: https://github.com/Antergos-NeXT/antergos-iso/issues
|
shortProductName: "Antergos NeXT"
|
||||||
releaseNotesUrl: https://github.com/Antergos-NeXT
|
version: "rolling"
|
||||||
|
shortVersion: "rolling"
|
||||||
|
versionedName: "Antergos NeXT rolling"
|
||||||
|
shortVersionedName: "Antergos NeXT"
|
||||||
|
bootloaderEntryName: "Antergos NeXT"
|
||||||
|
productUrl: "https://github.com/Antergos-NeXT"
|
||||||
|
supportUrl: "https://github.com/Antergos-NeXT"
|
||||||
|
knownIssuesUrl: "https://github.com/Antergos-NeXT/antergos-iso/issues"
|
||||||
|
releaseNotesUrl: "https://github.com/Antergos-NeXT"
|
||||||
|
donateUrl: ""
|
||||||
|
|
||||||
image: "squid.png"
|
images:
|
||||||
imageSize: 0
|
productIcon: "antergos-icon.png"
|
||||||
|
productLogo: "antergos-icon.png"
|
||||||
|
productWelcome: "antergos-logo.png"
|
||||||
|
|
||||||
|
style:
|
||||||
|
SidebarBackground: "#20252B"
|
||||||
|
SidebarText: "#C8D6E5"
|
||||||
|
SidebarTextCurrent: "#FFFFFF"
|
||||||
|
SidebarBackgroundCurrent: "#4A9EFF"
|
||||||
|
|
||||||
|
slideshow: "show.qml"
|
||||||
|
slideshowAPI: 2
|
||||||
...
|
...
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Antergos NeXT Installer Launcher
|
||||||
|
# Presents offline/online choice and launches Calamares with the right config
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Prefer zenity (GTK), fall back to dialog (curses)
|
||||||
|
if command -v zenity &>/dev/null; then
|
||||||
|
DIALOG="zenity"
|
||||||
|
elif command -v kdialog &>/dev/null; then
|
||||||
|
DIALOG="kdialog"
|
||||||
|
else
|
||||||
|
DIALOG=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check for internet connectivity
|
||||||
|
check_net() {
|
||||||
|
ping -c 1 -W 2 archlinux.org &>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
CHOICE=""
|
||||||
|
if [ -n "$DIALOG" ]; then
|
||||||
|
if [ "$DIALOG" = "zenity" ]; then
|
||||||
|
CHOICE=$(zenity --list \
|
||||||
|
--title="Antergos NeXT Installer" \
|
||||||
|
--text="Choose installation mode:" \
|
||||||
|
--width=500 --height=300 \
|
||||||
|
--column="Mode" --column="Description" \
|
||||||
|
"Offline" "Install GNOME desktop from the live ISO. No internet required." \
|
||||||
|
"Online" "Choose a desktop environment and install from the internet.")
|
||||||
|
else
|
||||||
|
CHOICE=$(kdialog --menu "Antergos NeXT Installer\nChoose installation mode:" \
|
||||||
|
"Offline" "Install GNOME desktop from the live ISO. No internet required." \
|
||||||
|
"Online" "Choose a desktop environment and install from the internet.")
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Antergos NeXT Installer"
|
||||||
|
echo "======================"
|
||||||
|
echo "1) Offline — Install GNOME from ISO (no internet)"
|
||||||
|
echo "2) Online — Choose DE and install from internet"
|
||||||
|
echo ""
|
||||||
|
read -rp "Choice [1]: " n
|
||||||
|
case "$n" in
|
||||||
|
2|online|Online) CHOICE="Online" ;;
|
||||||
|
*) CHOICE="Offline" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$CHOICE" in
|
||||||
|
"Online")
|
||||||
|
# Online mode: use netinstall for DE selection, no unpackfs
|
||||||
|
if ! check_net; then
|
||||||
|
if [ -n "$DIALOG" ]; then
|
||||||
|
"$DIALOG" --error --text="No internet connection detected.\n\nOnline installation requires a working network connection.\nPlease connect to the internet and try again."
|
||||||
|
fi
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
exec calamares -c /etc/calamares-online
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
# Offline mode: use unpackfs with GNOME squashfs
|
||||||
|
exec calamares -c /etc/calamares-offline
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
# 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" ]
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
groupsUrl: /etc/calamares/modules/netinstall.yaml
|
||||||
|
operation: install
|
||||||
@@ -0,0 +1,126 @@
|
|||||||
|
---
|
||||||
|
- name: "Desktop Environments"
|
||||||
|
description: "Select the desktop environment to install. Choose one."
|
||||||
|
selected: false
|
||||||
|
hidden: false
|
||||||
|
immutable: false
|
||||||
|
critical: false
|
||||||
|
subgroups:
|
||||||
|
- name: "KDE Plasma"
|
||||||
|
description: "Full-featured, modern desktop with KDE applications"
|
||||||
|
packages:
|
||||||
|
- plasma-meta
|
||||||
|
- kde-applications-meta
|
||||||
|
selected: false
|
||||||
|
critical: false
|
||||||
|
- name: "GNOME"
|
||||||
|
description: "Modern and streamlined desktop environment"
|
||||||
|
packages:
|
||||||
|
- gnome
|
||||||
|
- gnome-tweaks
|
||||||
|
- gnome-shell-extensions
|
||||||
|
selected: true
|
||||||
|
critical: false
|
||||||
|
- name: "Xfce"
|
||||||
|
description: "Fast and lightweight classic desktop"
|
||||||
|
packages:
|
||||||
|
- xfce4
|
||||||
|
- xfce4-goodies
|
||||||
|
selected: false
|
||||||
|
critical: false
|
||||||
|
- name: "Budgie"
|
||||||
|
description: "Elegant and simple desktop environment"
|
||||||
|
packages:
|
||||||
|
- budgie-desktop
|
||||||
|
- budgie-desktop-view
|
||||||
|
- budgie-screensaver
|
||||||
|
selected: false
|
||||||
|
critical: false
|
||||||
|
- name: "Cinnamon"
|
||||||
|
description: "Traditional desktop with modern conventions"
|
||||||
|
packages:
|
||||||
|
- cinnamon
|
||||||
|
- cinnamon-translations
|
||||||
|
selected: false
|
||||||
|
critical: false
|
||||||
|
- name: "MATE"
|
||||||
|
description: "Intuitive and attractive classic desktop"
|
||||||
|
packages:
|
||||||
|
- mate
|
||||||
|
- mate-extra
|
||||||
|
selected: false
|
||||||
|
critical: false
|
||||||
|
- name: "LXQt"
|
||||||
|
description: "Lightweight Qt desktop environment"
|
||||||
|
packages:
|
||||||
|
- lxqt
|
||||||
|
- lxqt-connman-applet
|
||||||
|
- oxygen-icons
|
||||||
|
selected: false
|
||||||
|
critical: false
|
||||||
|
- name: "i3 / Sway"
|
||||||
|
description: "Tiling window managers for power users"
|
||||||
|
packages:
|
||||||
|
- i3-wm
|
||||||
|
- i3status
|
||||||
|
- i3lock
|
||||||
|
- dmenu
|
||||||
|
- sway
|
||||||
|
- waybar
|
||||||
|
- wofi
|
||||||
|
selected: false
|
||||||
|
critical: false
|
||||||
|
|
||||||
|
- name: "Base System"
|
||||||
|
description: "Core system packages for a functional Arch Linux installation"
|
||||||
|
selected: true
|
||||||
|
hidden: true
|
||||||
|
immutable: true
|
||||||
|
critical: true
|
||||||
|
packages:
|
||||||
|
- base
|
||||||
|
- base-devel
|
||||||
|
- linux
|
||||||
|
- linux-firmware
|
||||||
|
- linux-headers
|
||||||
|
- amd-ucode
|
||||||
|
- intel-ucode
|
||||||
|
- networkmanager
|
||||||
|
- network-manager-applet
|
||||||
|
- sudo
|
||||||
|
- nano
|
||||||
|
- which
|
||||||
|
- man-db
|
||||||
|
- man-pages
|
||||||
|
|
||||||
|
- name: "Antergos Packages"
|
||||||
|
description: "Antergos NeXT branding and tools"
|
||||||
|
selected: true
|
||||||
|
hidden: true
|
||||||
|
immutable: true
|
||||||
|
critical: false
|
||||||
|
packages:
|
||||||
|
- antergos-wallpapers
|
||||||
|
- antergos-welcome
|
||||||
|
- yay
|
||||||
|
- calamares
|
||||||
|
- calamares-branding-antergos-next
|
||||||
|
- firefox
|
||||||
|
|
||||||
|
- name: "Hardware Support"
|
||||||
|
description: "Additional hardware drivers and firmware"
|
||||||
|
selected: false
|
||||||
|
hidden: false
|
||||||
|
immutable: false
|
||||||
|
critical: false
|
||||||
|
packages:
|
||||||
|
- mesa
|
||||||
|
- mesa-utils
|
||||||
|
- vulkan-intel
|
||||||
|
- vulkan-radeon
|
||||||
|
- nvidia-open
|
||||||
|
- nvidia-utils
|
||||||
|
- pipewire
|
||||||
|
- pipewire-pulse
|
||||||
|
- pipewire-alsa
|
||||||
|
- wireplumber
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
---
|
||||||
|
modules-search: [ /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-systemd
|
||||||
|
- grubcfg
|
||||||
|
- bootloader
|
||||||
|
- packages
|
||||||
|
- removeuser
|
||||||
|
- 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
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
---
|
||||||
|
modules-search: [ /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-systemd
|
||||||
|
- grubcfg
|
||||||
|
- bootloader
|
||||||
|
- packages
|
||||||
|
- removeuser
|
||||||
|
- 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
|
||||||
@@ -7,37 +7,224 @@ Presentation
|
|||||||
id: presentation
|
id: presentation
|
||||||
|
|
||||||
Timer {
|
Timer {
|
||||||
interval: 5000
|
interval: 8000
|
||||||
running: presentation.activatedInCalamares
|
running: presentation.activatedInCalamares
|
||||||
repeat: true
|
repeat: true
|
||||||
onTriggered: presentation.goToNextSlide()
|
onTriggered: presentation.goToNextSlide()
|
||||||
}
|
}
|
||||||
|
|
||||||
Slide {
|
Slide {
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
|
Image {
|
||||||
|
id: logo
|
||||||
|
source: "antergos-logo.png"
|
||||||
|
width: 320
|
||||||
|
height: 92
|
||||||
|
fillMode: Image.PreserveAspectFit
|
||||||
|
anchors {
|
||||||
|
centerIn: parent
|
||||||
|
verticalCenterOffset: -40
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
anchors.centerIn: parent
|
anchors {
|
||||||
|
top: logo.bottom
|
||||||
|
topMargin: 20
|
||||||
|
horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
text: "Welcome to Antergos NeXT"
|
text: "Welcome to Antergos NeXT"
|
||||||
font.pixelSize: 24
|
font.pixelSize: 22
|
||||||
font.bold: true
|
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 {
|
Slide {
|
||||||
Text {
|
anchors.fill: parent
|
||||||
anchors.centerIn: parent
|
|
||||||
text: "Installing Antergos NeXT..."
|
Rectangle {
|
||||||
font.pixelSize: 20
|
anchors.fill: parent
|
||||||
color: "#333"
|
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 {
|
Slide {
|
||||||
|
anchors.fill: parent
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
anchors.centerIn: parent
|
anchors {
|
||||||
text: "Almost done!"
|
top: parent.top
|
||||||
|
topMargin: 30
|
||||||
|
horizontalCenter: parent.horizontalCenter
|
||||||
|
}
|
||||||
|
text: "Desktop Environments"
|
||||||
font.pixelSize: 20
|
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() {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,47 +1,78 @@
|
|||||||
/* Antergos NeXT Calamares theme - minimal */
|
/* Antergos NeXT Calamares theme */
|
||||||
QWidget {
|
QWidget {
|
||||||
font-family: "Noto Sans", "DejaVu Sans", sans-serif;
|
font-family: "Noto Sans", "DejaVu Sans", sans-serif;
|
||||||
font-size: 10pt;
|
font-size: 10pt;
|
||||||
color: #333;
|
color: #2C3E50;
|
||||||
}
|
}
|
||||||
QMainWindow {
|
QMainWindow {
|
||||||
background-color: #f5f5f5;
|
background-color: #FAFBFC;
|
||||||
}
|
}
|
||||||
QLabel#titleLabel {
|
QLabel#titleLabel {
|
||||||
font-size: 18pt;
|
font-size: 18pt;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: #2a7ab5;
|
color: #4A9EFF;
|
||||||
}
|
}
|
||||||
QLabel#subtitleLabel {
|
QLabel#subtitleLabel {
|
||||||
font-size: 11pt;
|
font-size: 11pt;
|
||||||
color: #666;
|
color: #7F8C8D;
|
||||||
}
|
}
|
||||||
QPushButton {
|
QPushButton {
|
||||||
background-color: #2a7ab5;
|
background-color: #4A9EFF;
|
||||||
color: white;
|
color: white;
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
padding: 6px 16px;
|
padding: 7px 18px;
|
||||||
min-height: 24px;
|
min-height: 24px;
|
||||||
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
QPushButton:hover {
|
QPushButton:hover {
|
||||||
background-color: #23689e;
|
background-color: #3B8AE5;
|
||||||
}
|
}
|
||||||
QPushButton:pressed {
|
QPushButton:pressed {
|
||||||
background-color: #1c557f;
|
background-color: #2D7BD4;
|
||||||
|
}
|
||||||
|
QPushButton:disabled {
|
||||||
|
background-color: #BDC3C7;
|
||||||
|
color: #95A5A6;
|
||||||
}
|
}
|
||||||
QPushButton#sidebarButton {
|
QPushButton#sidebarButton {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
color: #333;
|
color: #C8D6E5;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
padding: 8px;
|
padding: 10px 14px;
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
|
font-size: 10pt;
|
||||||
}
|
}
|
||||||
QPushButton#sidebarButton:hover {
|
QPushButton#sidebarButton:hover {
|
||||||
background-color: #e0e0e0;
|
background-color: #2C3E50;
|
||||||
}
|
}
|
||||||
QPushButton#sidebarButton:checked {
|
QPushButton#sidebarButton:checked {
|
||||||
background-color: #2a7ab5;
|
background-color: #4A9EFF;
|
||||||
color: white;
|
color: white;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
QComboBox {
|
||||||
|
padding: 5px 10px;
|
||||||
|
border: 1px solid #D5D8DC;
|
||||||
|
border-radius: 4px;
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
QLineEdit {
|
||||||
|
padding: 6px 10px;
|
||||||
|
border: 1px solid #D5D8DC;
|
||||||
|
border-radius: 4px;
|
||||||
|
background: white;
|
||||||
|
}
|
||||||
|
QProgressBar {
|
||||||
|
border: 1px solid #D5D8DC;
|
||||||
|
border-radius: 4px;
|
||||||
|
background: #ECF0F1;
|
||||||
|
text-align: center;
|
||||||
|
height: 20px;
|
||||||
|
}
|
||||||
|
QProgressBar::chunk {
|
||||||
|
background: qlineargradient(x1:0, y1:0, x2:1, y2:0,
|
||||||
|
stop:0 #4A9EFF, stop:1 #8BC4FF);
|
||||||
|
border-radius: 3px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
unpack:
|
||||||
|
- source: "/run/archiso/bootmnt/arch/x86_64/airootfs.sfs"
|
||||||
|
sourcefs: "squashfs"
|
||||||
|
destination: "/"
|
||||||
|
...
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
---
|
||||||
|
requirements:
|
||||||
|
internet: true
|
||||||
|
storage: 8.0
|
||||||
|
ram: 2.0
|
||||||
|
power: true
|
||||||
|
required:
|
||||||
|
- storage
|
||||||
|
- ram
|
||||||
|
- power
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
_pkgname="calamares"
|
_pkgname="calamares"
|
||||||
pkgname="$_pkgname"
|
pkgname="$_pkgname"
|
||||||
pkgver=3.4.2
|
pkgver=3.4.2
|
||||||
pkgrel=1
|
pkgrel=3
|
||||||
pkgdesc="Distribution-independent installer framework"
|
pkgdesc="Distribution-independent installer framework"
|
||||||
url="https://codeberg.org/Calamares/calamares"
|
url="https://codeberg.org/Calamares/calamares"
|
||||||
license=("GPL-3.0-or-later")
|
license=("GPL-3.0-or-later")
|
||||||
@@ -33,8 +33,6 @@ sha256sums=('733bbbb00dc9f84874bd5c22960952f317ea2537565431179fa2152b2fbfdccc')
|
|||||||
|
|
||||||
build() {
|
build() {
|
||||||
local _skip_modules=(
|
local _skip_modules=(
|
||||||
dracut
|
|
||||||
dracutlukscfg
|
|
||||||
dummycpp
|
dummycpp
|
||||||
dummyprocess
|
dummyprocess
|
||||||
dummypython
|
dummypython
|
||||||
@@ -43,7 +41,6 @@ build() {
|
|||||||
initramfscfg
|
initramfscfg
|
||||||
interactiveterminal
|
interactiveterminal
|
||||||
packagechooser
|
packagechooser
|
||||||
packagechooserq
|
|
||||||
services-openrc
|
services-openrc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user