diff --git a/README.md b/README.md index 90248ad..75a9514 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ Custom package repository for Antergos NeXT ISO builds. |---------|-------------| | `calamares` | Universal installer framework (Qt6) — [upstream](https://codeberg.org/calamares/calamares) | | `calamares-branding-antergos-next` | Antergos Calamares branding + netinstall-based installer + launcher | -| `calamares-branding-antergos-next-minimal` | Themed CMake module for first-run branding (no slideshow) | | `antergos-next-keyring` | GPG keyring for the `[antergos-pkgs]` repo | | `antergos-next-mirrorlist` | Mirror list for `[antergos-pkgs]` | | `antergos-release` | Antergos NeXT `/etc/os-release` | @@ -57,8 +56,6 @@ pacman -S calamares calamares-branding-antergos-next antergos-wallpapers - **Launcher** (`calamares-next`) — launches Calamares with online settings - **Animated space slideshow** — rocket, stars, comet, moon with smooth 700ms transitions -A `calamares-branding-antergos-next-minimal` variant is also provided for the first-run welcome screen (no slideshow, CMake-themable). - ## How it works On each push to `master` (or weekly Monday), GitHub Actions: diff --git a/packages.yaml b/packages.yaml index 2aa6693..caa5939 100644 --- a/packages.yaml +++ b/packages.yaml @@ -13,7 +13,6 @@ packages: - pipewire - calamares - calamares-branding-antergos-next - - calamares-branding-antergos-next-minimal - antergos-xfce-theme - downgrade - yay diff --git a/packages/antergos-hyprland-config/PKGBUILD b/packages/antergos-hyprland-config/PKGBUILD index 4cbfb05..e93ff0d 100644 --- a/packages/antergos-hyprland-config/PKGBUILD +++ b/packages/antergos-hyprland-config/PKGBUILD @@ -2,7 +2,7 @@ pkgname=antergos-hyprland-config pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc='Antergos NeXT Hyprland configuration — dark theme with waybar, rofi, dunst' arch=('any') url="https://github.com/Antergos-NeXT/antergos-packages" diff --git a/packages/antergos-i3-config/PKGBUILD b/packages/antergos-i3-config/PKGBUILD index 6b8cf3e..8108db0 100644 --- a/packages/antergos-i3-config/PKGBUILD +++ b/packages/antergos-i3-config/PKGBUILD @@ -2,7 +2,7 @@ pkgname=antergos-i3-config pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc='Antergos NeXT i3 WM configuration — Dracula dark theme with polybar, rofi, picom' arch=('any') url="https://github.com/Antergos-NeXT/antergos-packages" diff --git a/packages/antergos-sway-config/PKGBUILD b/packages/antergos-sway-config/PKGBUILD index 8d8b987..d99847f 100644 --- a/packages/antergos-sway-config/PKGBUILD +++ b/packages/antergos-sway-config/PKGBUILD @@ -2,7 +2,7 @@ pkgname=antergos-sway-config pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc='Antergos NeXT Sway WM configuration — dark theme with waybar, wofi, mako' arch=('any') url="https://github.com/Antergos-NeXT/antergos-packages" diff --git a/packages/calamares-branding-antergos-next-minimal/Dia.qml b/packages/calamares-branding-antergos-next-minimal/Dia.qml deleted file mode 100644 index 60c1389..0000000 --- a/packages/calamares-branding-antergos-next-minimal/Dia.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.15 - -Item { - property string title - property string body - property string footer - property url image -} diff --git a/packages/calamares-branding-antergos-next-minimal/PKGBUILD b/packages/calamares-branding-antergos-next-minimal/PKGBUILD deleted file mode 100644 index 371d779..0000000 --- a/packages/calamares-branding-antergos-next-minimal/PKGBUILD +++ /dev/null @@ -1,129 +0,0 @@ -# Maintainer: Celestia Ludenberg - -pkgname=calamares-branding-antergos-next-minimal -pkgver=1.0 -pkgrel=1 -pkgdesc="Calamares branding for Antergos NeXT Minimal (Xfce) with offline/online installer support" -arch=('any') -url="https://github.com/Antergos-NeXT" -license=('GPL3') -depends=('calamares' 'yad') -optdepends=('zenity: fallback for graphical mode chooser dialog') -source=("branding.desc" - "stylesheet.qss" - "show.qml" - "Dia.qml" - "Slider.qml" - "calamares-sidebar.qml" - "calamares-navigation.qml" - "background.jpg" - "pan-up-symbolic.svg" - "pan-end-symbolic.svg" - "pan-start-symbolic.svg" - "draw-rectangle.svg" - "unpackfs.conf" - "initcpiocfg.conf" - "initcpio.conf" - "antergos-logo.png" - "antergos-icon.png" - "netinstall.yaml" - "netinstall.conf" - "packagechooser.conf" - "welcome.conf" - "settings_offline.conf" - "settings_online.conf" - "minimal-info.qml" - "calamares-next.sh") -sha256sums=('SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') - -package() { - # Branding data (shared between offline/online) - local _brand="/usr/share/calamares/branding/antergos-next-minimal" - install -dm755 "${pkgdir}${_brand}" - cp "branding.desc" "${pkgdir}${_brand}/" - cp "stylesheet.qss" "${pkgdir}${_brand}/" - cp "show.qml" "${pkgdir}${_brand}/" - cp "Dia.qml" "${pkgdir}${_brand}/" - cp "Slider.qml" "${pkgdir}${_brand}/" - cp "calamares-sidebar.qml" "${pkgdir}${_brand}/" - cp "calamares-navigation.qml" "${pkgdir}${_brand}/" - cp "background.jpg" "${pkgdir}${_brand}/" - cp "pan-up-symbolic.svg" "${pkgdir}${_brand}/" - cp "pan-end-symbolic.svg" "${pkgdir}${_brand}/" - cp "pan-start-symbolic.svg" "${pkgdir}${_brand}/" - cp "draw-rectangle.svg" "${pkgdir}${_brand}/" - cp "antergos-logo.png" "${pkgdir}${_brand}/" - cp "antergos-icon.png" "${pkgdir}${_brand}/" - cp "minimal-info.qml" "${pkgdir}${_brand}/" - - # Also overwrite default branding so Artix calamares package can't sneak in - local _defbrand="/usr/share/calamares/branding/default" - install -dm755 "${pkgdir}${_defbrand}" - cp "branding.desc" "${pkgdir}${_defbrand}/" - cp "show.qml" "${pkgdir}${_defbrand}/" - cp "Dia.qml" "${pkgdir}${_defbrand}/" - cp "Slider.qml" "${pkgdir}${_defbrand}/" - cp "calamares-sidebar.qml" "${pkgdir}${_defbrand}/" - cp "calamares-navigation.qml" "${pkgdir}${_defbrand}/" - cp "background.jpg" "${pkgdir}${_defbrand}/" - cp "pan-up-symbolic.svg" "${pkgdir}${_defbrand}/" - cp "pan-end-symbolic.svg" "${pkgdir}${_defbrand}/" - cp "pan-start-symbolic.svg" "${pkgdir}${_defbrand}/" - cp "draw-rectangle.svg" "${pkgdir}${_defbrand}/" - cp "antergos-logo.png" "${pkgdir}${_defbrand}/" - cp "antergos-icon.png" "${pkgdir}${_defbrand}/" - - # Shared Calamares modules - install -dm755 "${pkgdir}/etc/calamares/modules" - cp "unpackfs.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 - install -dm755 "${pkgdir}/etc/calamares-offline" - cp "settings_offline.conf" "${pkgdir}/etc/calamares-offline/settings.conf" - ln -sf "/usr/share/calamares/qml" "${pkgdir}/etc/calamares-offline/qml" - ln -sf "/usr/share/calamares/branding" "${pkgdir}/etc/calamares-offline/branding" - - # Online config directory - install -dm755 "${pkgdir}/etc/calamares-online" - cp "settings_online.conf" "${pkgdir}/etc/calamares-online/settings.conf" - ln -sf "/usr/share/calamares/qml" "${pkgdir}/etc/calamares-online/qml" - ln -sf "/usr/share/calamares/branding" "${pkgdir}/etc/calamares-online/branding" - - # Default: offline mode (for direct calamares launch) - install -dm755 "${pkgdir}/etc/calamares" - ln -sf "../calamares-offline/settings.conf" "${pkgdir}/etc/calamares/settings.conf" - ln -sf "/usr/share/calamares/branding" "${pkgdir}/etc/calamares/branding" - - # Launcher script - install -dm755 "${pkgdir}/usr/bin" - install -m755 "calamares-next.sh" "${pkgdir}/usr/bin/calamares-next" -} diff --git a/packages/calamares-branding-antergos-next-minimal/Slider.qml b/packages/calamares-branding-antergos-next-minimal/Slider.qml deleted file mode 100644 index 6115982..0000000 --- a/packages/calamares-branding-antergos-next-minimal/Slider.qml +++ /dev/null @@ -1,85 +0,0 @@ -import QtQuick 2.15 - -Item { - property list slides - property int currentSlideIndex: 0 - property int _currentSlideIndex: 0 - - function reset() { - currentSlideIndex = 0 - _currentSlideIndex = 0 - wrapper.opacity = 1 - } - - onCurrentSlideIndexChanged: { - if (currentSlideIndex >= slides.length) { - currentSlideIndex = 0 - } - if (_currentSlideIndex !== currentSlideIndex) { - slideOut.start() - } - } - - Item { - id: wrapper - anchors.fill: parent - - Column { - anchors.centerIn: parent - width: parent.width - spacing: 0 - - Text { - id: titleText - font { - family: "Roboto" - weight: Font.Medium - pixelSize: 26 - } - color: "#FFFFFF" - text: slides[_currentSlideIndex].title - wrapMode: Text.WordWrap - width: parent.width - lineHeight: 1.25 - bottomPadding: 20 - } - - Text { - id: bodyText - width: parent.width - font { - family: "Roboto" - weight: Font.Normal - pixelSize: 14 - } - color: "#C4C6D0" - text: slides[_currentSlideIndex].body - wrapMode: Text.WordWrap - lineHeight: 1.55 - bottomPadding: 20 - } - - Text { - id: footerText - font { - family: "Roboto" - weight: Font.Medium - pixelSize: 12 - } - color: "#8E9099" - text: slides[_currentSlideIndex].footer ?? "" - wrapMode: Text.WordWrap - width: parent.width - lineHeight: 1.4 - } - } - } - - SequentialAnimation { - id: slideOut - NumberAnimation { target: wrapper; property: "opacity"; to: 0; duration: 100; easing.type: Easing.OutQuad } - PropertyAction { target: wrapper; property: "opacity"; value: 0 } - ScriptAction { script: _currentSlideIndex = currentSlideIndex } - NumberAnimation { target: wrapper; property: "opacity"; to: 1; duration: 160; easing.type: Easing.InQuad } - } -} diff --git a/packages/calamares-branding-antergos-next-minimal/antergos-icon.png b/packages/calamares-branding-antergos-next-minimal/antergos-icon.png deleted file mode 100644 index a3748b7..0000000 Binary files a/packages/calamares-branding-antergos-next-minimal/antergos-icon.png and /dev/null differ diff --git a/packages/calamares-branding-antergos-next-minimal/antergos-logo.png b/packages/calamares-branding-antergos-next-minimal/antergos-logo.png deleted file mode 100644 index 7af7aae..0000000 Binary files a/packages/calamares-branding-antergos-next-minimal/antergos-logo.png and /dev/null differ diff --git a/packages/calamares-branding-antergos-next-minimal/background.jpg b/packages/calamares-branding-antergos-next-minimal/background.jpg deleted file mode 100644 index 5ed8e55..0000000 Binary files a/packages/calamares-branding-antergos-next-minimal/background.jpg and /dev/null differ diff --git a/packages/calamares-branding-antergos-next-minimal/branding.desc b/packages/calamares-branding-antergos-next-minimal/branding.desc deleted file mode 100644 index 889900e..0000000 --- a/packages/calamares-branding-antergos-next-minimal/branding.desc +++ /dev/null @@ -1,40 +0,0 @@ ---- -componentName: antergos-next-minimal - -welcomeStyleCalamares: false -welcomeExpandingLogo: true - -windowExpanding: normal -windowSize: 920px,630px -windowPlacement: center - -sidebar: qml,top -navigation: qml,bottom - -strings: - productName: "Antergos NeXT Minimal" - shortProductName: "Antergos NeXT" - version: "rolling" - shortVersion: "rolling" - versionedName: "Antergos NeXT Minimal rolling" - shortVersionedName: "Antergos NeXT Minimal" - 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: "" - -images: - 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 diff --git a/packages/calamares-branding-antergos-next-minimal/calamares-navigation.qml b/packages/calamares-branding-antergos-next-minimal/calamares-navigation.qml deleted file mode 100644 index c83084c..0000000 --- a/packages/calamares-branding-antergos-next-minimal/calamares-navigation.qml +++ /dev/null @@ -1,123 +0,0 @@ -import io.calamares.ui 1.0 -import io.calamares.core 1.0 - -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import Qt5Compat.GraphicalEffects - -Rectangle { - id: bottomBar - color: "#20252B" - height: 68 - width: parent ? parent.width : 1024 - - layer.enabled: true - layer.effect: DropShadow { - transparentBorder: true - radius: 4 - samples: 8 - color: Qt.rgba(0, 0, 0, 0.4) - } - - RowLayout { - anchors.fill: parent - anchors.leftMargin: 12 - anchors.rightMargin: 20 - spacing: 8 - - Button { - id: backButton - text: qsTr("Back") - flat: true - enabled: ViewManager.backEnabled - implicitHeight: 42 - font { - family: "Roboto" - weight: Font.Medium - pixelSize: 14 - } - contentItem: Text { - text: "← " + parent.text - font: parent.font - color: parent.enabled ? "#E3E2E6" : Qt.rgba(0.89, 0.89, 0.90, 0.35) - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - leftPadding: 16 - rightPadding: 16 - } - background: Rectangle { - color: parent.hovered && parent.enabled - ? Qt.rgba(0.89, 0.89, 0.90, 0.06) - : "transparent" - radius: 21 - Behavior on color { ColorAnimation { duration: 120 } } - } - onClicked: ViewManager.back() - } - - Item { Layout.fillWidth: true } - - Button { - id: cancelButton - text: qsTr("Cancel") - flat: true - enabled: ViewManager.quitEnabled - implicitHeight: 42 - font { - family: "Roboto" - weight: Font.Medium - pixelSize: 14 - } - contentItem: Text { - text: parent.text - font: parent.font - color: parent.enabled ? "#FFB4AB" : Qt.rgba(1.0, 0.71, 0.67, 0.35) - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - leftPadding: 14 - rightPadding: 14 - } - background: Rectangle { - color: parent.hovered && parent.enabled - ? Qt.rgba(1.0, 0.71, 0.67, 0.07) - : "transparent" - radius: 21 - Behavior on color { ColorAnimation { duration: 120 } } - } - onClicked: ViewManager.quit() - } - - Button { - id: nextButton - enabled: true - implicitWidth: 120 - implicitHeight: 42 - font { - family: "Roboto" - weight: Font.Medium - pixelSize: 14 - } - text: qsTr(ViewManager.nextEnabled ? "Next" : "Done") - contentItem: Text { - text: parent.text + " →" - font: parent.font - color: "#FFFFFF" - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - } - background: Rectangle { - color: parent.hovered ? "#3B8BDE" : "#4A9EFF" - radius: 21 - Behavior on color { ColorAnimation { duration: 120 } } - } - onClicked: { - if (ViewManager.nextEnabled) { - ViewManager.next() - } else { - ViewManager.quit() - } - } - } - } -} diff --git a/packages/calamares-branding-antergos-next-minimal/calamares-next.sh b/packages/calamares-branding-antergos-next-minimal/calamares-next.sh deleted file mode 100644 index d9e9d66..0000000 --- a/packages/calamares-branding-antergos-next-minimal/calamares-next.sh +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/bash - -# Antergos NeXT Calamares Installer Launcher - -GUIDIE() { - echo "calamares-next: $1" | sed -e 's|||g' -e 's|||g' - - local prog=yad - command -v yad &>/dev/null || prog=zenity - - local cmd=( - "$prog" --form --title="Error detected" - --text="calamares-next:\n$1\n" - --image=dialog-error - --button=yad-quit:1 - ) - "${cmd[@]}" - exit 1 -} - -FollowFile() { - local tailfile="$1" - local term_title="$2" - local xpos="$3" - local ypos="$4" - - case "$CurrentDesktop" in - xfce) xfce4-terminal -T "$term_title" --geometry="120x20+$xpos+$ypos" -x tail -f "$tailfile" & ;; - kde) setsid konsole -e tail -f "$tailfile" &> /dev/null ;; - esac -} - -CatchChrootedPacmanLog() { - local pacmanlog="" - local lockfile="$HOME/.$progname.lck" - - while true ; do - sleep 2 - pacmanlog="$(/usr/bin/ls -1 /tmp/calamares-root-*/var/log/pacman.log 2>/dev/null | /usr/bin/tail -n 1)" - if [ -n "$pacmanlog" ] ; then - [ -r "$lockfile" ] && return - /usr/bin/touch "$lockfile" - FollowFile "$pacmanlog" "Pacman log" 400 50 - break - fi - done -} - -LogHeader() { - local calamares_version date - calamares_version="$(pacman -Q calamares 2>/dev/null | awk '{print $NF}')" - date=$(date -u "+%x %X") - - cat < $log -########## $log by calamares-next -########## Started (UTC): $date -########## Install mode: $mode -########## Calamares version: $calamares_version -EOF -} - -InstallLog_Start() { - LogHeader - - if [ "$ShowInstallLog" = "TRUE" ] ; then - FollowFile "$log" "Install log" 20 20 - fi -} - -Calamares_Start() { - if [ "$EUID" = 0 ]; then - calamares -D8 >> $log & - return - fi - - local kdesu=/usr/lib/kf6/kdesu - [ -x $kdesu ] || kdesu=kdesu - - case "$CurrentDesktop" in - kde) $kdesu -t -c "calamares -D8" >> $log & ;; - *) pkexec calamares -D8 >> $log & ;; - esac -} - -AskMode() { - local ICO="/usr/share/calamares/branding/antergos-next/antergos-icon.png" - [ -f "$ICO" ] || ICO="system-software-install" - - yad --info \ - --title="Notice" \ - --image=dialog-information \ - --borders=20 \ - --width=500 \ - --text="The so-called \"Offline Install\" has been removed.\n\nIt was never truly offline — all DE packages were\ndownloaded from the internet regardless. The rootfs\nonly contained live session essentials, so there was\nnothing meaningful to unpack.\n\nAll packages are now installed online via basestrap." \ - --button="Continue":0 - - yad --form \ - --title="Antergos NeXT Installer" \ - --image="$ICO" \ - --borders=20 \ - --height=200 --width=480 \ - --buttons-layout=spread \ - --field=" ":LBL "" \ - --field="Online Install":LBL "" \ - --field="Full desktop selection from the internet.":LBL "" \ - --field="Choose your desktop environment, customize packages,":LBL "" \ - --field="get the latest updates.":LBL "" \ - --field=" ":LBL "" \ - --button="Install":0 -} - -InstallWithLogs() { - InstallLog_Start - Calamares_Start - - if [ "$ShowPacmanLog" = "TRUE" ] ; then - CatchChrootedPacmanLog - else - sleep 5 - fi -} - -SetConfig() { - sudo rm -f "/etc/calamares/settings.conf" - sudo cp "/etc/calamares-online/settings.conf" "/etc/calamares/settings.conf" - PreLog "Using online settings" -} - -PreLog() { - echo "==> $1" >> "$prelogfile" -} - -Main() { - progname="${0##*/}" - - [ -x /usr/bin/calamares ] || GUIDIE "/usr/bin/calamares is needed for installing Antergos NeXT" - - local CurrentDesktop="" - if [ "$XDG_CURRENT_DESKTOP" ]; then - CurrentDesktop=$(echo "$XDG_CURRENT_DESKTOP" | tr '[:upper:]' '[:lower:]') - elif [ "$DESKTOP_SESSION" ]; then - CurrentDesktop=$(echo "$DESKTOP_SESSION" | tr '[:upper:]' '[:lower:]') - fi - - local ShowInstallLog="FALSE" - local ShowPacmanLog="TRUE" - local Home=/home/antergos - local log=$Home/antergos-install.log - local workdir="" - local prelogfile="" - - workdir="$Home/work.$progname.xyz" - mkdir -p "$workdir" - - prelogfile="$workdir/preliminary.log" - rm -f "$prelogfile" - - AskMode - mode=online - SetConfig - InstallWithLogs -} - -Main "$@" diff --git a/packages/calamares-branding-antergos-next-minimal/calamares-sidebar.qml b/packages/calamares-branding-antergos-next-minimal/calamares-sidebar.qml deleted file mode 100644 index f4601ad..0000000 --- a/packages/calamares-branding-antergos-next-minimal/calamares-sidebar.qml +++ /dev/null @@ -1,90 +0,0 @@ -import io.calamares.ui 1.0 -import io.calamares.core 1.0 - -import QtQuick 2.15 -import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 -import Qt5Compat.GraphicalEffects - -Rectangle { - id: topBar - color: "#20252B" - height: 64 - width: parent ? parent.width : 1024 - - layer.enabled: true - layer.effect: DropShadow { - transparentBorder: true - radius: 4 - samples: 8 - color: Qt.rgba(0, 0, 0, 0.4) - } - - RowLayout { - anchors.fill: parent - anchors.leftMargin: 20 - anchors.rightMargin: 20 - spacing: 14 - - Image { - id: logo - sourceSize.width: 34 - sourceSize.height: 34 - fillMode: Image.PreserveAspectFit - source: Branding.imagePath(Branding.ProductLogo) - Layout.alignment: Qt.AlignVCenter - } - - Text { - text: "Antergos NeXT" - color: "#E3E2E6" - font { - family: "Roboto" - weight: Font.Medium - pixelSize: 17 - letterSpacing: 0.3 - } - Layout.alignment: Qt.AlignVCenter - } - - Item { Layout.fillWidth: true } - - Row { - spacing: 8 - Layout.alignment: Qt.AlignVCenter - - Repeater { - id: dotRepeater - model: ViewManager - - Rectangle { - width: index === ViewManager.currentStepIndex ? 10 : 7 - height: 7 - radius: 3.5 - color: index === ViewManager.currentStepIndex - ? "#4A9EFF" : "#8E9099" - opacity: index === ViewManager.currentStepIndex ? 1 : 0.35 - Behavior on width { NumberAnimation { duration: 200 } } - Behavior on color { ColorAnimation { duration: 200 } } - } - } - } - } - - Rectangle { - anchors { - bottom: parent.bottom - left: parent.left - right: parent.right - } - height: 3 - color: Qt.rgba(0.56, 0.57, 0.60, 0.2) - - Rectangle { - height: parent.height - width: parent.width * ((ViewManager.currentStepIndex + 1) / Math.max(dotRepeater.count, 1)) - color: "#4A9EFF" - Behavior on width { NumberAnimation { duration: 400; easing.type: Easing.OutCubic } } - } - } -} diff --git a/packages/calamares-branding-antergos-next-minimal/draw-rectangle.svg b/packages/calamares-branding-antergos-next-minimal/draw-rectangle.svg deleted file mode 100644 index 706f502..0000000 --- a/packages/calamares-branding-antergos-next-minimal/draw-rectangle.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/calamares-branding-antergos-next-minimal/initcpio.conf b/packages/calamares-branding-antergos-next-minimal/initcpio.conf deleted file mode 100644 index 626fa45..0000000 --- a/packages/calamares-branding-antergos-next-minimal/initcpio.conf +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-FileCopyrightText: no -# SPDX-License-Identifier: CC0-1.0 ---- -kernel: linux -be_unsafe: false diff --git a/packages/calamares-branding-antergos-next-minimal/initcpiocfg.conf b/packages/calamares-branding-antergos-next-minimal/initcpiocfg.conf deleted file mode 100644 index 79b4ce4..0000000 --- a/packages/calamares-branding-antergos-next-minimal/initcpiocfg.conf +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-FileCopyrightText: no -# SPDX-License-Identifier: CC0-1.0 ---- -useSystemdHook: false -source: "/etc/mkinitcpio.conf" diff --git a/packages/calamares-branding-antergos-next-minimal/minimal-info.qml b/packages/calamares-branding-antergos-next-minimal/minimal-info.qml deleted file mode 100644 index 8fa15bd..0000000 --- a/packages/calamares-branding-antergos-next-minimal/minimal-info.qml +++ /dev/null @@ -1,90 +0,0 @@ -/* Antergos NeXT Minimal — info page */ -import QtQuick -import QtQuick.Layouts -import QtQuick.Controls - -ColumnLayout { - width: parent.width - spacing: 20 - - Image { - source: "antergos-logo.png" - sourceSize.width: 96 - sourceSize.height: 96 - fillMode: Image.PreserveAspectFit - Layout.alignment: Qt.AlignHCenter - } - - Label { - text: "Antergos NeXT Minimal" - font.pointSize: 20 - font.bold: true - Layout.alignment: Qt.AlignHCenter - color: "#4A9EFF" - } - - Rectangle { - height: 1 - color: "#FF6B6B" - Layout.fillWidth: true - Layout.leftMargin: 24 - Layout.rightMargin: 24 - } - - Label { - text: "⚠ NOTICE" - font.pointSize: 14 - font.bold: true - Layout.alignment: Qt.AlignHCenter - color: "#FF6B6B" - } - - Label { - text: "This is the Minimal (Xfce) edition of Antergos NeXT. The main Plasma ISO ballooned to ~2.8 GB (over GitHub's 2 GB release limit) from all the bundled KDE packages, wallpapers, and apps. This Xfce build trims the fat while keeping the full installer and repository access." - font.pointSize: 11 - wrapMode: Text.WordWrap - Layout.fillWidth: true - Layout.leftMargin: 24 - Layout.rightMargin: 24 - color: "#C8D6E5" - } - - Label { - text: "What's different from the Plasma edition:" - font.pointSize: 11 - font.bold: true - Layout.leftMargin: 24 - color: "#C8D6E5" - } - - Column { - spacing: 4 - Layout.leftMargin: 40 - Repeater { - model: [ - "Uses Xfce desktop instead of KDE Plasma — lighter and faster", - "No KDE applications (uses Falkon browser, Xfce native apps)", - "Smaller ISO size (~1.5 GB vs ~2.8 GB)", - "Same Calamares installer, same repos, same init choices", - "Better for older hardware, VMs, or minimal setups" - ] - Label { - text: "• " + modelData - font.pointSize: 10 - color: "#C8D6E5" - } - } - } - - Label { - text: "If you installed this just to install Plasma from the repos and pretend it's the full ISO — yeah, fair enough. We can't blame you." - font.pointSize: 10 - italic: true - wrapMode: Text.WordWrap - Layout.fillWidth: true - Layout.leftMargin: 24 - Layout.rightMargin: 24 - Layout.topMargin: 8 - color: "#FF6B6B" - } -} diff --git a/packages/calamares-branding-antergos-next-minimal/netinstall.conf b/packages/calamares-branding-antergos-next-minimal/netinstall.conf deleted file mode 100644 index 026fb7c..0000000 --- a/packages/calamares-branding-antergos-next-minimal/netinstall.conf +++ /dev/null @@ -1,7 +0,0 @@ ---- -groupsUrl: - - file:///etc/calamares/modules/netinstall.yaml -required: true -label: - sidebar: "Packages" - title: "Packages (select your desktop environment and additional packages)" diff --git a/packages/calamares-branding-antergos-next-minimal/netinstall.yaml b/packages/calamares-branding-antergos-next-minimal/netinstall.yaml deleted file mode 100644 index 49d0128..0000000 --- a/packages/calamares-branding-antergos-next-minimal/netinstall.yaml +++ /dev/null @@ -1,241 +0,0 @@ -- name: "KDE Plasma" - description: "Full-featured, modern desktop with KDE Plasma and applications" - selected: true - critical: false - packages: - - ark - - bluedevil - - breeze-gtk - - dolphin - - dolphin-plugins - - 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 - - antergos-release - - antergos-lsb-release - - antergos-grub-theme - - firefox -- name: "Hardware Support" - description: "Additional hardware drivers and firmware" - selected: false - critical: false - packages: - - mesa - - mesa-utils - - vulkan-intel - - vulkan-radeon - - nvidia-open - - nvidia-utils - - pipewire - - pipewire-pulse - - pipewire-alsa - - wireplumber diff --git a/packages/calamares-branding-antergos-next-minimal/packagechooser.conf b/packages/calamares-branding-antergos-next-minimal/packagechooser.conf deleted file mode 100644 index 15ad7c2..0000000 --- a/packages/calamares-branding-antergos-next-minimal/packagechooser.conf +++ /dev/null @@ -1,55 +0,0 @@ ---- -mode: required -method: legacy -labels: - step: "Desktop Environment" -items: - - id: "" - name: "No 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-minimal/pan-end-symbolic.svg b/packages/calamares-branding-antergos-next-minimal/pan-end-symbolic.svg deleted file mode 100644 index e2d4c84..0000000 --- a/packages/calamares-branding-antergos-next-minimal/pan-end-symbolic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/calamares-branding-antergos-next-minimal/pan-start-symbolic.svg b/packages/calamares-branding-antergos-next-minimal/pan-start-symbolic.svg deleted file mode 100644 index 6a3013e..0000000 --- a/packages/calamares-branding-antergos-next-minimal/pan-start-symbolic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/calamares-branding-antergos-next-minimal/pan-up-symbolic.svg b/packages/calamares-branding-antergos-next-minimal/pan-up-symbolic.svg deleted file mode 100644 index 717e898..0000000 --- a/packages/calamares-branding-antergos-next-minimal/pan-up-symbolic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/calamares-branding-antergos-next-minimal/settings_offline.conf b/packages/calamares-branding-antergos-next-minimal/settings_offline.conf deleted file mode 100644 index d8cb9f6..0000000 --- a/packages/calamares-branding-antergos-next-minimal/settings_offline.conf +++ /dev/null @@ -1,51 +0,0 @@ ---- -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 - - luksopenswaphookcfg - - luksbootkeyfile - - initcpiocfg - - initcpio - - users - - displaymanager - - networkcfg - - hwclock - - services-artix - - grubcfg - - bootloader - - postcfg - - umount - - show: - - finished - -branding: antergos-next-minimal - -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-minimal/settings_online.conf b/packages/calamares-branding-antergos-next-minimal/settings_online.conf deleted file mode 100644 index 65ff5fc..0000000 --- a/packages/calamares-branding-antergos-next-minimal/settings_online.conf +++ /dev/null @@ -1,54 +0,0 @@ ---- -modules-search: [ /usr/lib/calamares/modules, /etc/calamares/modules ] - -sequence: - - 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-minimal - -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-minimal/show.qml b/packages/calamares-branding-antergos-next-minimal/show.qml deleted file mode 100644 index 667e358..0000000 --- a/packages/calamares-branding-antergos-next-minimal/show.qml +++ /dev/null @@ -1,158 +0,0 @@ -import QtQuick 2.15 -import Qt5Compat.GraphicalEffects - -Item { - id: root - width: 920 - height: 630 - - function onActivate() { - timer.restart() - slider.reset() - } - - function onLeave() { - } - - Timer { - id: timer - interval: 12000 - running: true - repeat: true - onTriggered: slider.currentSlideIndex++ - } - - MouseArea { - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onClicked: { - timer.restart() - slider.currentSlideIndex++ - } - } - - Image { - id: background - anchors.fill: parent - source: "background.jpg" - sourceSize.width: parent.width - sourceSize.height: parent.height - fillMode: Image.PreserveAspectCrop - } - - Rectangle { - anchors.fill: parent - color: Qt.rgba(0, 0, 0, 0.55) - } - - Rectangle { - anchors.fill: parent - gradient: Gradient { - GradientStop { position: 0.0; color: Qt.rgba(0, 0, 0, 0.15) } - GradientStop { position: 0.5; color: "transparent" } - GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.3) } - } - } - - Rectangle { - id: card - width: 460 - height: 380 - radius: 12 - anchors.centerIn: parent - anchors.horizontalCenterOffset: 40 - color: "#2B2930" - - layer.enabled: true - layer.effect: DropShadow { - transparentBorder: true - radius: 40 - samples: 56 - color: Qt.rgba(0, 0, 0, 0.5) - } - - Rectangle { - anchors.fill: parent - radius: 12 - color: "transparent" - border { color: Qt.rgba(1, 1, 1, 0.04); width: 1 } - } - - Item { - anchors { - fill: parent - margins: 32 - } - - Slider { - id: slider - anchors.fill: parent - slides: [ - Dia { - title: qsTr("Welcome to Antergos NeXT Minimal") - body: qsTr("Arch Linux powered by Artix. Rolling release, dinit init, Xfce desktop, and the latest software.") - 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("A curated selection of the best Linux desktops") - }, - Dia { - title: qsTr("Antergos Tools") - body: qsTr("Welcome app for system configuration, Calamares installer with offline and online modes, and full access to the AUR.") - footer: qsTr("Everything you need to get started") - }, - Dia { - title: qsTr("Open Source") - body: qsTr("Free and open source software built by the community for the community.") - 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.") - footer: qsTr("Reboot and enjoy Antergos NeXT") - } - ] - } - } - } - - Image { - id: logo - source: "antergos-logo.png" - width: 140 - height: 40 - fillMode: Image.PreserveAspectFit - anchors { - bottom: parent.bottom - bottomMargin: 20 - left: parent.left - leftMargin: 24 - } - opacity: 0.45 - } - - Row { - anchors { - bottom: parent.bottom - bottomMargin: 20 - horizontalCenter: parent.horizontalCenter - } - spacing: 6 - - Repeater { - model: slider.slides.length - - Rectangle { - width: index == slider.currentSlideIndex ? 22 : 7 - height: 7 - radius: 3.5 - color: index == slider.currentSlideIndex ? "#4A9EFF" : "#8E9099" - opacity: index == slider.currentSlideIndex ? 1 : 0.35 - Behavior on width { NumberAnimation { duration: 250 } } - Behavior on color { ColorAnimation { duration: 200 } } - } - } - } -} diff --git a/packages/calamares-branding-antergos-next-minimal/stylesheet.qss b/packages/calamares-branding-antergos-next-minimal/stylesheet.qss deleted file mode 100644 index c7200e7..0000000 --- a/packages/calamares-branding-antergos-next-minimal/stylesheet.qss +++ /dev/null @@ -1,246 +0,0 @@ -/* Antergos NeXT Calamares theme — dark */ -QWidget { - font-family: "Noto Sans", "DejaVu Sans", sans-serif; - font-size: 10pt; -} -QMainWindow, QDialog, QWizard, QWidget#sidebar { - background-color: #20252B; - color: #C8D6E5; -} -QWidget#mainContent, QScrollArea, QFrame, QStackedWidget { - background-color: #20252B; - color: #C8D6E5; -} -QLabel { - color: #C8D6E5; - background: transparent; -} -QLabel#titleLabel { - font-size: 18pt; - font-weight: bold; - color: #4A9EFF; -} -QLabel#subtitleLabel { - font-size: 11pt; - color: #C8D6E5; -} -QGroupBox { - background-color: #262C34; - border: 1px solid #3A3F47; - border-radius: 4px; - margin-top: 12px; - padding: 12px 8px 8px 8px; - color: #C8D6E5; - font-weight: bold; -} -QGroupBox::title { - subcontrol-origin: margin; - subcontrol-position: top left; - padding: 2px 8px; - color: #4A9EFF; -} -QPushButton { - background-color: #4A9EFF; - color: white; - border: none; - border-radius: 4px; - padding: 7px 18px; - min-height: 24px; - font-weight: bold; -} -QPushButton:hover { - background-color: #3B8AE5; -} -QPushButton:pressed { - background-color: #2D7BD4; -} -QPushButton:disabled { - background-color: #3A3F47; - color: #7F8C8D; -} -QComboBox { - padding: 5px 10px; - border: 1px solid #3A3F47; - border-radius: 4px; - background: #2C3138; - color: #FFFFFF; - min-height: 24px; -} -QComboBox::drop-down { - border: none; - width: 24px; -} -QComboBox::down-arrow { - image: none; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 6px solid #C8D6E5; - margin-right: 6px; -} -QComboBox QAbstractItemView { - background: #2C3138; - color: #C8D6E5; - selection-background-color: #4A9EFF; - selection-color: #FFFFFF; - border: 1px solid #3A3F47; - outline: none; -} -QLineEdit, QSpinBox, QDoubleSpinBox { - padding: 6px 10px; - border: 1px solid #3A3F47; - border-radius: 4px; - background: #2C3138; - color: #FFFFFF; - min-height: 20px; -} -QTextEdit, QPlainTextEdit { - border: 1px solid #3A3F47; - border-radius: 4px; - background: #2C3138; - color: #C8D6E5; - padding: 4px; -} -QListView, QTreeView, QTableView { - background: #2C3138; - color: #C8D6E5; - border: 1px solid #3A3F47; - border-radius: 4px; - outline: none; - alternate-background-color: #262C34; -} -QListView::item, QTreeView::item, QTableView::item { - padding: 4px 8px; - min-height: 24px; - border: none; -} -QListView::item:selected, QTreeView::item:selected, QTableView::item:selected { - background: #4A9EFF; - color: #FFFFFF; -} -QListView::item:hover, QTreeView::item:hover, QTableView::item:hover { - background: #3A3F47; -} -QHeaderView::section { - background: #1A1F24; - color: #C8D6E5; - padding: 4px 8px; - border: none; - border-right: 1px solid #3A3F47; - border-bottom: 1px solid #3A3F47; - font-weight: bold; -} -QScrollBar:vertical { - background: #1A1F24; - width: 10px; - margin: 0; -} -QScrollBar::handle:vertical { - background: #3A3F47; - border-radius: 5px; - min-height: 30px; -} -QScrollBar::handle:vertical:hover { - background: #4A9EFF; -} -QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { - height: 0; - background: transparent; -} -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: transparent; -} -QScrollBar:horizontal { - background: #1A1F24; - height: 10px; - margin: 0; -} -QScrollBar::handle:horizontal { - background: #3A3F47; - border-radius: 5px; - min-width: 30px; -} -QScrollBar::handle:horizontal:hover { - background: #4A9EFF; -} -QScrollBar::add-line:horizontal, QScrollBar::sub-line:horizontal { - width: 0; - background: transparent; -} -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: transparent; -} -QRadioButton, QCheckBox { - color: #C8D6E5; - spacing: 6px; - min-height: 22px; -} -QRadioButton::indicator, QCheckBox::indicator { - width: 16px; - height: 16px; - border: 2px solid #3A3F47; - border-radius: 8px; - background: #2C3138; -} -QRadioButton::indicator:checked, QCheckBox::indicator:checked { - background: #4A9EFF; - border-color: #4A9EFF; -} -QRadioButton::indicator:hover, QCheckBox::indicator:hover { - border-color: #4A9EFF; -} -QCheckBox::indicator { - border-radius: 3px; -} -QCheckBox::indicator:checked { - image: none; -} -QTabWidget::pane { - background: #262C34; - border: 1px solid #3A3F47; - border-radius: 4px; -} -QTabBar::tab { - background: #1A1F24; - color: #7F8C8D; - padding: 6px 16px; - border: none; - min-height: 24px; -} -QTabBar::tab:selected { - background: #262C34; - color: #FFFFFF; - border-bottom: 2px solid #4A9EFF; -} -QTabBar::tab:hover { - color: #C8D6E5; -} -QProgressBar { - border: 1px solid #3A3F47; - border-radius: 4px; - background: #2C3138; - text-align: center; - height: 20px; - color: #FFFFFF; -} -QProgressBar::chunk { - background: qlineargradient(x1:0, y1:0, x2:1, y2:0, - stop:0 #4A9EFF, stop:1 #8BC4FF); - border-radius: 3px; -} -QSpinBox::up-button, QDoubleSpinBox::up-button { - border: none; - background: transparent; - width: 20px; -} -QSpinBox::down-button, QDoubleSpinBox::down-button { - border: none; - background: transparent; - width: 20px; -} -QToolTip { - background: #20252B; - color: #C8D6E5; - border: 1px solid #4A9EFF; - padding: 4px 8px; - border-radius: 4px; -} diff --git a/packages/calamares-branding-antergos-next-minimal/unpackfs.conf b/packages/calamares-branding-antergos-next-minimal/unpackfs.conf deleted file mode 100644 index fc6f900..0000000 --- a/packages/calamares-branding-antergos-next-minimal/unpackfs.conf +++ /dev/null @@ -1,6 +0,0 @@ ---- -unpack: - - source: "/run/archiso/bootmnt/arch/x86_64/airootfs.sfs" - sourcefs: "squashfs" - destination: "/" -... \ No newline at end of file diff --git a/packages/calamares-branding-antergos-next-minimal/welcome.conf b/packages/calamares-branding-antergos-next-minimal/welcome.conf deleted file mode 100644 index 4a8fc34..0000000 --- a/packages/calamares-branding-antergos-next-minimal/welcome.conf +++ /dev/null @@ -1,10 +0,0 @@ ---- -requirements: - internet: true - storage: 8.0 - ram: 2.0 - power: true - required: - - storage - - ram - - power diff --git a/packages/calamares-branding-antergos-next/PKGBUILD b/packages/calamares-branding-antergos-next/PKGBUILD index e816e8e..901e17d 100644 --- a/packages/calamares-branding-antergos-next/PKGBUILD +++ b/packages/calamares-branding-antergos-next/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Celestia Ludenberg pkgname=calamares-branding-antergos-next -pkgver=1.0 -pkgrel=24 -pkgdesc="Calamares branding for Antergos NeXT with offline/online installer support" +pkgver=2.0 +pkgrel=1 +pkgdesc="Calamares branding for Antergos NeXT online installer" arch=('any') url="https://github.com/Antergos-NeXT" license=('GPL3') diff --git a/packages/calamares-branding-antergos-next/netinstall.yaml b/packages/calamares-branding-antergos-next/netinstall.yaml index c82b95a..8fc10ac 100644 --- a/packages/calamares-branding-antergos-next/netinstall.yaml +++ b/packages/calamares-branding-antergos-next/netinstall.yaml @@ -93,38 +93,4 @@ - 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_dm.conf b/packages/calamares-branding-antergos-next/packagechooser_dm.conf index a461316..eac5fea 100644 --- a/packages/calamares-branding-antergos-next/packagechooser_dm.conf +++ b/packages/calamares-branding-antergos-next/packagechooser_dm.conf @@ -1,6 +1,6 @@ --- mode: required -method: netinstall-select +method: netinstall-add labels: step: "Display Manager" default: SDDM @@ -9,19 +9,55 @@ items: name: "SDDM" description: "QML-based display manager (KDE default)" screenshot: "" + netinstall: + name: "SDDM" + selected: true + critical: false + packages: + - sddm + - sddm-dinit + - pixie-sddm-git - id: LightDM name: "LightDM" description: "Cross-desktop display manager (GTK)" screenshot: "" + netinstall: + name: "LightDM" + selected: true + critical: false + packages: + - lightdm + - lightdm-dinit - id: LXDM name: "LXDM" description: "Lightweight display manager (LXDE)" screenshot: "" + netinstall: + name: "LXDM" + selected: true + critical: false + packages: + - lxdm + - lxdm-dinit - id: greetd name: "greetd" description: "Minimal display manager (recommended for COSMIC)" screenshot: "" + netinstall: + name: "greetd" + selected: true + critical: false + packages: + - greetd + - greetd-dinit - id: LY name: "LY" description: "Minimal TUI display manager" screenshot: "" + netinstall: + name: "LY" + selected: true + critical: false + packages: + - ly + - ly-dinit