feat: bury offline mode, ship antergos-layan-theme
remember when i thought an offline installer was a good idea? a pre-built squashfs that still needed internet to install DEs? "offline" in name only. it was a lie. a beautiful, naive lie. so i killed it. ripped out the mode picker, the connectivity check, the whole AskMode() circus. calamares-next now just shows a notice saying "yeah that wasnt actually offline" and launches directly into online mode. no more pretending. also fixed the QML nav button because having a greyed out "Next" on the last page is terrible UX. now it says "Done" and quits. youre welcome. and since we nuked the offline mode, might as well make the online mode look fucking spectacular. enter antergos-layan-theme: - kvantum theme because your apps deserve better than qt dreck - sddm theme (AntergosDark-Layan) for a sexy login screen - every plasma plasmoid from the rice (panel colorizer, netspeed, shutdown switch, applets, separators, music toolbar, the works) - yakuake arc-dark skin - antergos logos in /usr/share/logos and /usr/share/pixmaps - konsole profile, desktop appletsrc, all that jazz - kde_settings.conf now points to AntergosDark-Layan sddm theme also replaced the old antergos-grub-theme with the Layan grub theme because the old one was a git-sourced abomination. 75 distro icons, terminal box, selection widgets, antergos wallpaper. ships to /usr/share/grub/themes/antergos/ so calamares finds it. oh and a dozen audit fixes: - kscreenlockerrc wallpaper path fixed - kdialogrc no longer says some other distro - 7 stale knsregistry files deleted (dev machine was leaking) - systemd-inhibit guarded with command -v (dinit doesnt have it) - plasma restart uses killall not systemctl --user - "XeroLinux Toolkit" -> "Antergos Toolkit" in appletsrc - KDE_SESSION_VERSION=5 -> =6 (its 2026) - mirrorlist script says Artix not Arch - SDDM Messages.sh removed from build artifacts
This commit is contained in:
@@ -90,8 +90,7 @@ Rectangle {
|
||||
|
||||
Button {
|
||||
id: nextButton
|
||||
text: qsTr("Next")
|
||||
enabled: ViewManager.nextEnabled
|
||||
enabled: true
|
||||
implicitWidth: 120
|
||||
implicitHeight: 42
|
||||
font {
|
||||
@@ -99,6 +98,7 @@ Rectangle {
|
||||
weight: Font.Medium
|
||||
pixelSize: 14
|
||||
}
|
||||
text: qsTr(ViewManager.nextEnabled ? "Next" : "Done")
|
||||
contentItem: Text {
|
||||
text: parent.text + " →"
|
||||
font: parent.font
|
||||
@@ -107,13 +107,17 @@ Rectangle {
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
}
|
||||
background: Rectangle {
|
||||
color: parent.enabled
|
||||
? (parent.hovered ? "#3B8BDE" : "#4A9EFF")
|
||||
: Qt.rgba(0.29, 0.62, 1.0, 0.35)
|
||||
color: parent.hovered ? "#3B8BDE" : "#4A9EFF"
|
||||
radius: 21
|
||||
Behavior on color { ColorAnimation { duration: 120 } }
|
||||
}
|
||||
onClicked: ViewManager.next()
|
||||
onClicked: {
|
||||
if (ViewManager.nextEnabled) {
|
||||
ViewManager.next()
|
||||
} else {
|
||||
ViewManager.quit()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,70 +86,44 @@ AskMode() {
|
||||
local ICO="/usr/share/calamares/branding/antergos-next/antergos-icon.png"
|
||||
[ -f "$ICO" ] || ICO="system-software-install"
|
||||
|
||||
if [ "$has_connection" = yes ] ; then
|
||||
yad --form \
|
||||
--title="Antergos NeXT Installer" \
|
||||
--image="$ICO" \
|
||||
--borders=20 \
|
||||
--height=250 --width=520 \
|
||||
--buttons-layout=spread \
|
||||
--field=" ":LBL "" \
|
||||
--field="<b>Online Install</b>":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 "" \
|
||||
--field="<b>Offline Install</b>":LBL "" \
|
||||
--field="Quick install from the live ISO.":LBL "" \
|
||||
--field="Install KDE Plasma desktop directly from the ISO.":LBL "" \
|
||||
--field="No internet required.":LBL "" \
|
||||
--field=" ":LBL "" \
|
||||
--button="Offline":13 \
|
||||
--button="Online":11
|
||||
else
|
||||
yad --form \
|
||||
--title="Antergos NeXT Installer" \
|
||||
--image="$ICO" \
|
||||
--borders=20 \
|
||||
--height=200 --width=520 \
|
||||
--buttons-layout=spread \
|
||||
--field=" ":LBL "" \
|
||||
--field="<b>Offline Install</b>":LBL "" \
|
||||
--field="Quick install from the live ISO.":LBL "" \
|
||||
--field="Install KDE Plasma desktop directly from the ISO.":LBL "" \
|
||||
--field=" ":LBL "" \
|
||||
--button="Offline":13
|
||||
fi
|
||||
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="<b>Online Install</b>":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" = "FALSE" ] ; then
|
||||
if [ "$ShowPacmanLog" = "TRUE" ] ; then
|
||||
CatchChrootedPacmanLog
|
||||
else
|
||||
sleep 5
|
||||
return
|
||||
fi
|
||||
|
||||
case "$mode" in
|
||||
online) CatchChrootedPacmanLog ;;
|
||||
offline) CatchChrootedPacmanLog ;;
|
||||
esac
|
||||
}
|
||||
|
||||
SetConfig() {
|
||||
case "$mode" in
|
||||
online)
|
||||
sudo rm -f "/etc/calamares/settings.conf"
|
||||
sudo cp "/etc/calamares-online/settings.conf" "/etc/calamares/settings.conf"
|
||||
PreLog "Using online settings"
|
||||
;;
|
||||
offline)
|
||||
sudo rm -f "/etc/calamares/settings.conf"
|
||||
sudo cp "/etc/calamares-offline/settings.conf" "/etc/calamares/settings.conf"
|
||||
PreLog "Using offline settings"
|
||||
;;
|
||||
esac
|
||||
sudo rm -f "/etc/calamares/settings.conf"
|
||||
sudo cp "/etc/calamares-online/settings.conf" "/etc/calamares/settings.conf"
|
||||
PreLog "Using online settings"
|
||||
}
|
||||
|
||||
PreLog() {
|
||||
@@ -158,13 +132,9 @@ PreLog() {
|
||||
|
||||
Main() {
|
||||
progname="${0##*/}"
|
||||
has_connection=no
|
||||
show_mode=yes
|
||||
|
||||
[ -x /usr/bin/calamares ] || GUIDIE "<tt>/usr/bin/calamares</tt> is needed for installing Antergos NeXT"
|
||||
|
||||
ping -c 1 -W 2 archlinux.org &>/dev/null && has_connection=yes
|
||||
|
||||
local CurrentDesktop=""
|
||||
if [ "$XDG_CURRENT_DESKTOP" ]; then
|
||||
CurrentDesktop=$(echo "$XDG_CURRENT_DESKTOP" | tr '[:upper:]' '[:lower:]')
|
||||
@@ -173,10 +143,9 @@ Main() {
|
||||
fi
|
||||
|
||||
local ShowInstallLog="FALSE"
|
||||
local ShowPacmanLog="FALSE"
|
||||
local ShowPacmanLog="TRUE"
|
||||
local Home=/home/antergos
|
||||
local log=$Home/antergos-install.log
|
||||
local cfolder=/etc/calamares
|
||||
local workdir=""
|
||||
local prelogfile=""
|
||||
|
||||
@@ -186,27 +155,10 @@ Main() {
|
||||
prelogfile="$workdir/preliminary.log"
|
||||
rm -f "$prelogfile"
|
||||
|
||||
if [ "$show_mode" = yes ] ; then
|
||||
AskMode
|
||||
ret=$?
|
||||
case $ret in
|
||||
11) mode=online ;;
|
||||
13) mode=offline ;;
|
||||
*) exit $ret ;;
|
||||
esac
|
||||
else
|
||||
mode=offline
|
||||
fi
|
||||
|
||||
case "$mode" in
|
||||
online|offline)
|
||||
SetConfig
|
||||
InstallWithLogs
|
||||
;;
|
||||
*)
|
||||
GUIDIE "unsupported mode '$mode'"
|
||||
;;
|
||||
esac
|
||||
AskMode
|
||||
mode=online
|
||||
SetConfig
|
||||
InstallWithLogs
|
||||
}
|
||||
|
||||
Main "$@"
|
||||
|
||||
Reference in New Issue
Block a user