From 6219c3a8cf8e2bc28f128417b38a942c9517e893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Thu, 6 Aug 2026 19:31:23 +0200 Subject: [PATCH] feat: sync DM packagechooser to netinstall-add with inline groups - packagechooser_dm.conf (runtime + online ref): switch from netinstall-select to netinstall-add, move SDDM/LightDM/LXDM/greetd/LY packages inline into the chooser items; both copies byte-identical in content - netinstall.yaml (runtime + online ref): drop the now-inline DM groups; bring the online ref's Default group in line with runtime (add falkon, networkmanager, pipewire, wireplumber) --- NOTICES | 6 +- .../calamares-online/modules/netinstall.yaml | 70 ++++++------------- .../modules/packagechooser_dm.conf | 54 +++++++++++--- .../etc/calamares/modules/netinstall.yaml | 34 --------- .../calamares/modules/packagechooser_dm.conf | 38 +++++++++- 5 files changed, 107 insertions(+), 95 deletions(-) diff --git a/NOTICES b/NOTICES index a2c4bbf..c5d0aa1 100644 --- a/NOTICES +++ b/NOTICES @@ -42,7 +42,11 @@ spirit alive throughout the years. This project is licensed under GPLv3. See the LICENSE file for details. +## Trademarks + +Arch Linux, Artix Linux, KDE, and other third-party trademarks are the property of their respective owners and are used for identification purposes only. + ## Contributions Contributions are welcome! By submitting pull requests, you agree to license -your work under the same GPLv3 license. \ No newline at end of file +your work under the same GPLv3 license. diff --git a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/netinstall.yaml b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/netinstall.yaml index 941fe71..219ab35 100644 --- a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/netinstall.yaml +++ b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/netinstall.yaml @@ -14,9 +14,17 @@ - antergos-next-keyring - antergos-wallpapers - antergos-grub-theme + - falkon - mesa - mesa-utils - vulkan-nouveau + - networkmanager + - network-manager-applet + - pipewire + - pipewire-alsa + - pipewire-pulse + - wireplumber + - name: "Kernel" description: "Kernel and modules" @@ -48,25 +56,6 @@ - intel-ucode - amd-ucode -- 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: "Init Services" description: "Essential dinit services" selected: true @@ -88,38 +77,19 @@ - syslog-ng-dinit - power-profiles-daemon-dinit -- name: "SDDM" - description: "SDDM display manager" - selected: false +- name: "Utilities" + description: "System Utilities" + selected: true packages: - - sddm - - sddm-dinit - - pixie-sddm-git + - antergos-lsb-release + - nano + - vi -- name: "LightDM" - description: "LightDM display manager" +- name: "Devel" + description: "Development tools" 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 + - base-devel + - artools-base + - artools-iso + - artools-pkg diff --git a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/packagechooser_dm.conf b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/packagechooser_dm.conf index 2e50c90..995378a 100644 --- a/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/packagechooser_dm.conf +++ b/iso-profiles/antergos/live-overlay/etc/calamares-online/modules/packagechooser_dm.conf @@ -1,7 +1,7 @@ --- mode: required -method: netinstall-select +method: netinstall-add labels: step: "Display Manager" @@ -11,26 +11,62 @@ default: SDDM items: - id: SDDM - name: SDDM + 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 + name: lightdm description: "Cross-desktop display manager (GTK)" screenshot: "" + netinstall: + name: "LightDM" + selected: true + critical: false + packages: + - lightdm + - lightdm-dinit - id: LXDM - name: LXDM + name: lxdm description: "Lightweight display manager (LXDE)" screenshot: "" - - - id: LY - name: LY - description: "Minimal TUI display manager" - 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 diff --git a/iso-profiles/antergos/live-overlay/etc/calamares/modules/netinstall.yaml b/iso-profiles/antergos/live-overlay/etc/calamares/modules/netinstall.yaml index 1c49ed5..a844d37 100644 --- a/iso-profiles/antergos/live-overlay/etc/calamares/modules/netinstall.yaml +++ b/iso-profiles/antergos/live-overlay/etc/calamares/modules/netinstall.yaml @@ -96,38 +96,4 @@ -- 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/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser_dm.conf b/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser_dm.conf index ddea4e9..995378a 100644 --- a/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser_dm.conf +++ b/iso-profiles/antergos/live-overlay/etc/calamares/modules/packagechooser_dm.conf @@ -1,7 +1,7 @@ --- mode: required -method: netinstall-select +method: netinstall-add labels: step: "Display Manager" @@ -14,23 +14,59 @@ 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