From d015c02e448a533e18af34352e9a812eba12a4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Fri, 24 Jul 2026 20:00:08 +0200 Subject: [PATCH] feat: branding DE/DM selectors, slideshow content redesign, layan wallpaper fix calamares-branding-antergos-next: - Replace packagechooser.conf (method: legacy, init selector) with packagechooser_de.conf (9 DEs, netinstall-add) and packagechooser_dm.conf (5 DMs, netinstall-select) - Clean netinstall.yaml: remove Budgie, split i3/Sway, drop hidden groups - Update settings_online.conf with packagechooser@de + @dm instances - Redesign slideshow: 7 slides, accurate copy (Artix-based, not Arch), accent bar, better layout - Bump pkgrel to 23 antergos-layan-theme: - Fix plasma-org.kde.plasma.desktop-appletsrc video wallpaper path: Retro%20Sun%20WPE.mp4 -> antergos-wallpaper.mp4 --- .../plasma-org.kde.plasma.desktop-appletsrc | 2 +- .../calamares-branding-antergos-next/PKGBUILD | 18 +- .../Slider.qml | 29 +- .../netinstall.yaml | 371 +++++++----------- .../packagechooser_de.conf | 128 ++++++ .../packagechooser_dm.conf | 27 ++ .../settings_online.conf | 11 +- .../calamares-branding-antergos-next/show.qml | 28 +- 8 files changed, 358 insertions(+), 256 deletions(-) create mode 100644 packages/calamares-branding-antergos-next/packagechooser_de.conf create mode 100644 packages/calamares-branding-antergos-next/packagechooser_dm.conf diff --git a/packages/antergos-layan-theme/Configs/Home/.config/plasma-org.kde.plasma.desktop-appletsrc b/packages/antergos-layan-theme/Configs/Home/.config/plasma-org.kde.plasma.desktop-appletsrc index 4b0f1b1..977a034 100644 --- a/packages/antergos-layan-theme/Configs/Home/.config/plasma-org.kde.plasma.desktop-appletsrc +++ b/packages/antergos-layan-theme/Configs/Home/.config/plasma-org.kde.plasma.desktop-appletsrc @@ -647,7 +647,7 @@ positions={"1920x1080":["1","17"],"2560x1440":[]} sortMode=-1 [Containments][87][Wallpaper][luisbocanegra.smart.video.wallpaper.reborn][General] -VideoUrls=["file:///usr/share/backgrounds/antergos/Retro%20Sun%20WPE.mp4"] +VideoUrls=["file:///usr/share/backgrounds/antergos/antergos-wallpaper.mp4"] Volume=0 MuteMode=5 FillMode=2 diff --git a/packages/calamares-branding-antergos-next/PKGBUILD b/packages/calamares-branding-antergos-next/PKGBUILD index e6c9327..6369b28 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=22 +pkgrel=23 pkgdesc="Calamares branding for Antergos NeXT with offline/online installer support" arch=('any') url="https://github.com/Antergos-NeXT" @@ -26,9 +26,10 @@ source=("branding.desc" "initcpio.conf" "antergos-logo.png" "antergos-icon.png" - "netinstall.yaml" + "netinstall.yaml" "netinstall.conf" - "packagechooser.conf" + "packagechooser_de.conf" + "packagechooser_dm.conf" "welcome.conf" "settings_offline.conf" "settings_online.conf" @@ -53,9 +54,11 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') package() { # Branding data (shared between offline/online) @@ -100,7 +103,8 @@ package() { 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 "packagechooser_de.conf" "${pkgdir}/etc/calamares/modules/" + cp "packagechooser_dm.conf" "${pkgdir}/etc/calamares/modules/" cp "welcome.conf" "${pkgdir}/etc/calamares/modules/" # Offline config directory diff --git a/packages/calamares-branding-antergos-next/Slider.qml b/packages/calamares-branding-antergos-next/Slider.qml index 6115982..88fe268 100644 --- a/packages/calamares-branding-antergos-next/Slider.qml +++ b/packages/calamares-branding-antergos-next/Slider.qml @@ -29,19 +29,27 @@ Item { width: parent.width spacing: 0 + Rectangle { + width: 48 + height: 3 + radius: 1.5 + color: "#4A9EFF" + bottomPadding: 24 + } + Text { id: titleText font { family: "Roboto" - weight: Font.Medium - pixelSize: 26 + weight: Font.Bold + pixelSize: 28 } color: "#FFFFFF" text: slides[_currentSlideIndex].title wrapMode: Text.WordWrap width: parent.width - lineHeight: 1.25 - bottomPadding: 20 + lineHeight: 1.2 + bottomPadding: 16 } Text { @@ -52,10 +60,17 @@ Item { weight: Font.Normal pixelSize: 14 } - color: "#C4C6D0" + color: "#C8D6E5" text: slides[_currentSlideIndex].body wrapMode: Text.WordWrap - lineHeight: 1.55 + lineHeight: 1.6 + bottomPadding: 24 + } + + Rectangle { + width: parent.width + height: 1 + color: Qt.rgba(1, 1, 1, 0.06) bottomPadding: 20 } @@ -63,7 +78,7 @@ Item { id: footerText font { family: "Roboto" - weight: Font.Medium + weight: Font.Normal pixelSize: 12 } color: "#8E9099" diff --git a/packages/calamares-branding-antergos-next/netinstall.yaml b/packages/calamares-branding-antergos-next/netinstall.yaml index 4104fa6..5618a06 100644 --- a/packages/calamares-branding-antergos-next/netinstall.yaml +++ b/packages/calamares-branding-antergos-next/netinstall.yaml @@ -1,242 +1,151 @@ -- name: "KDE Plasma" - description: "Full-featured, modern desktop with KDE Plasma and applications" +- name: "Default" + description: "Default packages" + hidden: false selected: true - critical: false - packages: - - ark - - bluedevil - - breeze-gtk - - dolphin - - dolphin-plugins - - discover - - ffmpegthumbs - - gwenview - - kate - - kcalc - - kde-cli-tools - - kde-gtk-config - - kdeconnect - - kdegraphics-thumbnailers - - kdenetwork-filesharing - - kdeplasma-addons - - kinfocenter - - kio-admin - - kio-extras - - kio-fuse - - konsole - - kscreen - - kwallet-pam - - kwayland-integration - - okular - - partitionmanager - - plasma-browser-integration - - plasma-desktop - - plasma-disks - - plasma-nm - - plasma-pa - - plasma-systemmonitor - - plasma-workspace - - powerdevil - - print-manager - - qt6-imageformats - - spectacle - - xdg-desktop-portal-kde - - xsettingsd - - antergos-plasma-theme - - antergos-sddm-theme - - antergos-next-desktop-settings -- name: "Xfce" - description: "Fast and lightweight classic desktop" - selected: false - critical: false - packages: - - blueman - - file-roller - - galculator - - gvfs - - gvfs-afc - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-nfs - - gvfs-smb - - lightdm - - lightdm-slick-greeter - - mousepad - - network-manager-applet - - parole - - ristretto - - thunar-archive-plugin - - thunar-media-tags-plugin - - xdg-user-dirs-gtk - - xfce4 - - xfce4-battery-plugin - - xfce4-mount-plugin - - xfce4-netload-plugin - - xfce4-notifyd - - xfce4-pulseaudio-plugin - - xfce4-screensaver - - xfce4-screenshooter - - xfce4-taskmanager - - xfce4-whiskermenu-plugin -- name: "Budgie" - description: "Elegant and simple desktop environment" - selected: false - critical: false - packages: - - budgie-desktop - - budgie-desktop-view - - budgie-extras - - eog - - file-roller - - gedit - - gnome-keyring - - gnome-terminal - - gvfs - - gvfs-afc - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-nfs - - gvfs-smb - - lightdm - - lightdm-slick-greeter - - mutter - - nemo - - nemo-fileroller - - network-manager-applet - - xdg-user-dirs-gtk -- name: "Cinnamon" - description: "Traditional desktop with modern conventions" - selected: false - critical: false - packages: - - cinnamon - - cinnamon-translations - - file-roller - - galculator - - gnome-system-monitor - - gnome-terminal - - gvfs - - gvfs-afc - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-nfs - - gvfs-smb - - lightdm - - lightdm-slick-greeter - - nemo-fileroller - - xdg-user-dirs-gtk -- name: "MATE" - description: "Intuitive and attractive classic desktop" - selected: false - critical: false - packages: - - gvfs - - gvfs-afc - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-nfs - - gvfs-smb - - lightdm - - lightdm-slick-greeter - - mate - - mate-extra - - network-manager-applet - - xdg-user-dirs-gtk -- name: "LXQt" - description: "Lightweight Qt desktop environment" - selected: false - critical: false - packages: - - breeze - - breeze-gtk - - featherpad - - gvfs - - gvfs-mtp - - libstatgrab - - libsysstat - - lm_sensors - - lxqt - - lxqt-archiver - - network-manager-applet - - oxygen-icons - - pavucontrol-qt - - print-manager - - xdg-utils - - xsettingsd -- name: "i3 / Sway" - description: "Tiling window managers for power users" - selected: false - critical: false - packages: - - dmenu - - dunst - - feh - - galculator - - gvfs - - gvfs-afc - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-nfs - - gvfs-smb - - i3-wm - - i3lock - - i3status - - lightdm - - lightdm-slick-greeter - - sway - - waybar - - wofi -- 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 - - antergos-next-keyring - - antergos-next-mirrorlist + - linux + - linux-headers + - grub + - efibootmgr + - sudo - antergos-release - - antergos-lsb-release + - antergos-next-keyring + - antergos-wallpapers - antergos-grub-theme - - firefox -- name: "Hardware Support" - description: "Additional hardware drivers and firmware" - selected: false - critical: false - packages: + - falkon - mesa - mesa-utils - - vulkan-intel - - vulkan-radeon - - nvidia-open - - nvidia-utils + - networkmanager + - network-manager-applet - pipewire - - pipewire-pulse - pipewire-alsa + - pipewire-pulse - wireplumber + +- name: "Kernel" + description: "Kernel and modules" + selected: false + packages: + - acpi_call + - bbswitch + - broadcom-wl + - tp_smapi + - linux-lts + - linux-lts-headers + +- name: "Firmware" + description: "Firmware" + selected: false + packages: + - b43-fwcutter + - linux-firmware + - linux-firmware-bnx2x + - linux-firmware-liquidio + - linux-firmware-marvell + - linux-firmware-mellanox + - linux-firmware-nfp + - linux-firmware-qcom + - linux-firmware-qlogic + - linux-firmware-whence + - sof-firmware + - alsa-firmware + - intel-ucode + - amd-ucode + +- name: "Init Services" + description: "Essential dinit services" + selected: true + critical: true + immutable: true + packages: + - dinit + - dbus-dinit + - networkmanager-dinit + - elogind-dinit + - cups-dinit + - avahi-dinit + - bluez-dinit + - cronie-dinit + - openssh-dinit + - alsa-utils-dinit + - acpid-dinit + - dhcpcd-dinit + - syslog-ng-dinit + - power-profiles-daemon-dinit + +- name: "Style" + description: "Antergos themes, icons, branding" + selected: false + packages: + - antergos-layan-theme + - tela-circle-icon-theme-git + - cava + - python-websockets + - qt6-websockets + - btop + - imagemagick + - fastfetch + - noto-fonts-emoji + - adw-gtk-theme + - ttf-hack-nerd + - ttf-fira-code + - ttf-terminus-nerd + - ttf-meslo-nerd + - kwin-zones + - oh-my-posh-bin + - pacseek + +- name: "Utilities" + description: "System Utilities" + selected: true + packages: + - antergos-lsb-release + - nano + - vi + +- name: "Devel" + description: "Development tools" + selected: false + packages: + - base-devel + - artools-base + - artools-iso + - artools-pkg + +- name: "SDDM" + description: "SDDM display manager" + selected: false + packages: + - sddm + - sddm-dinit + - pixie-sddm-git + +- name: "LightDM" + description: "LightDM display manager" + selected: false + packages: + - lightdm + - lightdm-dinit + +- name: "LXDM" + description: "LXDM display manager" + selected: false + packages: + - lxdm + - lxdm-dinit + +- name: "greetd" + description: "greetd display manager" + selected: false + packages: + - greetd + - greetd-dinit + +- name: "LY" + description: "LY display manager" + selected: false + packages: + - ly + - ly-dinit diff --git a/packages/calamares-branding-antergos-next/packagechooser_de.conf b/packages/calamares-branding-antergos-next/packagechooser_de.conf new file mode 100644 index 0000000..3ab637f --- /dev/null +++ b/packages/calamares-branding-antergos-next/packagechooser_de.conf @@ -0,0 +1,128 @@ +--- +mode: required +method: netinstall-add +labels: + step: "Desktop Environment" +default: Plasma +items: + - id: Plasma + name: "KDE Plasma" + description: "Full-featured modern desktop. The default Antergos NeXT experience." + screenshot: "" + netinstall: + name: "KDE Plasma" + selected: true + critical: false + packages: + - plasma + - ark + - dolphin + - ffmpegthumbs + - gwenview + - kate + - keditbookmarks + - kfind + - kgpg + - kio-admin + - konsole + - konversation + - kwalletmanager + - okular + - partitionmanager + - antergos-next-desktop-settings + - id: Xfce + name: "Xfce" + description: "Lightweight traditional desktop. Fast and low on resources." + screenshot: "" + netinstall: + name: "Xfce" + selected: true + critical: false + packages: + - xfce4 + - xfce4-goodies + - id: Cinnamon + name: "Cinnamon" + description: "Traditional desktop with modern features (GNOME-based)" + screenshot: "" + netinstall: + name: "Cinnamon" + selected: true + critical: false + packages: + - cinnamon + - cinnamon-control-center + - cinnamon-desktop + - cinnamon-menus + - cinnamon-screensaver + - cinnamon-session + - cinnamon-settings-daemon + - cinnamon-translations + - id: MATE + name: "MATE" + description: "Classic desktop — continuation of GNOME 2" + screenshot: "" + netinstall: + name: "MATE" + selected: true + critical: false + packages: + - mate + - mate-extra + - id: LXQt + name: "LXQt" + description: "Lightweight Qt-based desktop" + screenshot: "" + netinstall: + name: "LXQt" + selected: true + critical: false + packages: + - lxqt + - id: i3 + name: "i3" + description: "Minimal tiling window manager (keyboard-driven)" + screenshot: "" + netinstall: + name: "i3" + selected: true + critical: false + packages: + - i3 + - antergos-i3-config + - id: Sway + name: "Sway" + description: "i3-compatible Wayland compositor" + screenshot: "" + netinstall: + name: "Sway" + selected: true + critical: false + packages: + - sway + - swaybg + - swayidle + - swaylock + - antergos-sway-config + - id: Hyprland + name: "Hyprland" + description: "Dynamic tiling Wayland compositor with eye candy" + screenshot: "" + netinstall: + name: "Hyprland" + selected: true + critical: false + packages: + - hyprland + - xdg-desktop-portal-hyprland + - antergos-hyprland-config + - id: COSMIC + name: "COSMIC" + description: "Modern Rust-based desktop. Select greetd as DM." + screenshot: "" + netinstall: + name: "COSMIC" + selected: true + critical: false + packages: + - cosmic diff --git a/packages/calamares-branding-antergos-next/packagechooser_dm.conf b/packages/calamares-branding-antergos-next/packagechooser_dm.conf new file mode 100644 index 0000000..a461316 --- /dev/null +++ b/packages/calamares-branding-antergos-next/packagechooser_dm.conf @@ -0,0 +1,27 @@ +--- +mode: required +method: netinstall-select +labels: + step: "Display Manager" +default: SDDM +items: + - id: SDDM + name: "SDDM" + description: "QML-based display manager (KDE default)" + screenshot: "" + - id: LightDM + name: "LightDM" + description: "Cross-desktop display manager (GTK)" + screenshot: "" + - id: LXDM + name: "LXDM" + description: "Lightweight display manager (LXDE)" + screenshot: "" + - id: greetd + name: "greetd" + description: "Minimal display manager (recommended for COSMIC)" + screenshot: "" + - id: LY + name: "LY" + description: "Minimal TUI display manager" + screenshot: "" diff --git a/packages/calamares-branding-antergos-next/settings_online.conf b/packages/calamares-branding-antergos-next/settings_online.conf index a3a0536..5bf27ac 100644 --- a/packages/calamares-branding-antergos-next/settings_online.conf +++ b/packages/calamares-branding-antergos-next/settings_online.conf @@ -6,7 +6,8 @@ sequence: - welcome - locale - keyboard - - packagechooser + - packagechooser@de + - packagechooser@dm - netinstall - partition - users @@ -37,6 +38,14 @@ sequence: - show: - finished +instances: +- id: de + module: packagechooser + config: packagechooser_de.conf +- id: dm + module: packagechooser + config: packagechooser_dm.conf + branding: antergos-next prompt-install: false diff --git a/packages/calamares-branding-antergos-next/show.qml b/packages/calamares-branding-antergos-next/show.qml index 6d4a534..58510eb 100644 --- a/packages/calamares-branding-antergos-next/show.qml +++ b/packages/calamares-branding-antergos-next/show.qml @@ -90,27 +90,37 @@ Item { slides: [ Dia { title: qsTr("Welcome to Antergos NeXT") - body: qsTr("Arch Linux powered by Artix. Rolling release, dinit init, and the latest software.") - footer: qsTr("Choose your preferred desktop environment during setup") + body: qsTr("Artix Linux, dinit init, rolling release.") + footer: qsTr("Choose your desktop environment during setup") }, Dia { title: qsTr("Desktop Environments") - body: qsTr("Select from KDE Plasma, Xfce, Cinnamon, MATE, LXQt, i3, Sway, Hyprland, or COSMIC.") - footer: qsTr("A curated selection of Linux desktops") + body: qsTr("Plasma, Xfce, Cinnamon, MATE, LXQt, i3, Sway, Hyprland, COSMIC.") + footer: qsTr("A curated selection — pick your favorite") }, Dia { - title: qsTr("Antergos Tools") - body: qsTr("Welcome app for system configuration, Calamares online installer, and full access to the AUR.") - footer: qsTr("Everything you need to get started") + title: qsTr("Init System") + body: qsTr("dinit — fast, parallel service boot. Optional runit and s6 available.") + footer: qsTr("Modern init, modern system") + }, + Dia { + title: qsTr("Two Installer Modes") + body: qsTr("Online: full DE, DM, and package selection. Offline: Plasma pre-configured, ready to go.") + footer: qsTr("You choose how you install") + }, + Dia { + title: qsTr("Features") + body: qsTr("Full AUR access. KDE Plasma live session. Calamares installer. Latest packages from Artix repos.") + footer: qsTr("Everything you need, nothing you don't") }, Dia { title: qsTr("Open Source") - body: qsTr("Free and open source software built by the community for the community.") + body: qsTr("Built by the community. Transparent, free, and always will be.") footer: qsTr("github.com/Antergos-NeXT") }, Dia { title: qsTr("Almost Done") - body: qsTr("Your system is being configured with your selected desktop environment, drivers, and applications.") + body: qsTr("Your system is being configured with your selected desktop and packages.") footer: qsTr("Reboot and enjoy Antergos NeXT") } ]