From 2de7a4ef16fe088c8104c57549391f97067649f8 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 10 Oct 2023 23:49:20 -0500 Subject: configs: Unify and de-duplicate configuration This requires Horizon 0.9.8pre3 or later (adelie/horizon@615278f). --- configs/base/kde.installfile | 4 +--- configs/base/lxqt.installfile | 4 +--- configs/base/mate.installfile | 4 +--- configs/live/aarch64-kde.installfile | 11 +---------- configs/live/aarch64-lxqt.installfile | 11 +---------- configs/live/aarch64-mate.installfile | 11 +---------- configs/live/armv7-kde.installfile | 11 +---------- configs/live/armv7-lxqt.installfile | 11 +---------- configs/live/armv7-mate.installfile | 11 +---------- configs/live/pmmx-kde.installfile | 11 +---------- configs/live/pmmx-lxqt.installfile | 11 +---------- configs/live/pmmx-mate.installfile | 11 +---------- configs/live/ppc-kde.installfile | 11 +---------- configs/live/ppc-lxqt.installfile | 11 +---------- configs/live/ppc-mate.installfile | 11 +---------- configs/live/ppc64-kde.installfile | 11 +---------- configs/live/ppc64-lxqt.installfile | 11 +---------- configs/live/ppc64-mate.installfile | 11 +---------- configs/live/x86_64-kde.installfile | 11 +---------- configs/live/x86_64-lxqt.installfile | 11 +---------- configs/live/x86_64-mate.installfile | 11 +---------- 21 files changed, 21 insertions(+), 189 deletions(-) diff --git a/configs/base/kde.installfile b/configs/base/kde.installfile index ed2de98..ae56e94 100644 --- a/configs/base/kde.installfile +++ b/configs/base/kde.installfile @@ -1,5 +1,5 @@ # Install KDE and SDDM auto-login for it. -pkginstall livecd-support-kde networkmanager +pkginstall livecd-support-horizon livecd-support-kde networkmanager # Start X on boot, if possible. svcenable udev boot @@ -9,5 +9,3 @@ svcenable elogind svcenable NetworkManager svcenable sddm svcenable wpa_supplicant - -inherit base.installfile diff --git a/configs/base/lxqt.installfile b/configs/base/lxqt.installfile index c75638a..9413707 100644 --- a/configs/base/lxqt.installfile +++ b/configs/base/lxqt.installfile @@ -1,5 +1,5 @@ # Install LXQt and SDDM auto-login for it. -pkginstall livecd-support-lxqt networkmanager +pkginstall livecd-support-horizon livecd-support-lxqt networkmanager # Start X on boot, if possible. svcenable udev boot @@ -8,5 +8,3 @@ svcenable elogind svcenable NetworkManager svcenable sddm svcenable wpa_supplicant - -inherit base.installfile diff --git a/configs/base/mate.installfile b/configs/base/mate.installfile index e0acf7b..976ee29 100644 --- a/configs/base/mate.installfile +++ b/configs/base/mate.installfile @@ -1,5 +1,5 @@ # Install MATE and SDDM auto-login for it. -pkginstall livecd-support-mate networkmanager +pkginstall livecd-support-horizon livecd-support-mate networkmanager # Start X on boot, if possible. svcenable udev boot @@ -8,5 +8,3 @@ svcenable elogind svcenable NetworkManager svcenable sddm svcenable wpa_supplicant - -inherit base.installfile diff --git a/configs/live/aarch64-kde.installfile b/configs/live/aarch64-kde.installfile index d2a31c7..77d38b7 100644 --- a/configs/live/aarch64-kde.installfile +++ b/configs/live/aarch64-kde.installfile @@ -1,11 +1,2 @@ -# Install KDE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-kde - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/aarch64.installfile +inherit ../base/kde.installfile diff --git a/configs/live/aarch64-lxqt.installfile b/configs/live/aarch64-lxqt.installfile index c3ea818..6c43c6a 100644 --- a/configs/live/aarch64-lxqt.installfile +++ b/configs/live/aarch64-lxqt.installfile @@ -1,11 +1,2 @@ -# Install LXQt and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-lxqt - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/aarch64.installfile +inherit ../base/lxqt.installfile diff --git a/configs/live/aarch64-mate.installfile b/configs/live/aarch64-mate.installfile index 8d36f8e..68af017 100644 --- a/configs/live/aarch64-mate.installfile +++ b/configs/live/aarch64-mate.installfile @@ -1,11 +1,2 @@ -# Install MATE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-mate - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/aarch64.installfile +inherit ../base/mate.installfile diff --git a/configs/live/armv7-kde.installfile b/configs/live/armv7-kde.installfile index 5142ee1..db68077 100644 --- a/configs/live/armv7-kde.installfile +++ b/configs/live/armv7-kde.installfile @@ -1,11 +1,2 @@ -# Install KDE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-kde - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/armv7.installfile +inherit ../base/kde.installfile diff --git a/configs/live/armv7-lxqt.installfile b/configs/live/armv7-lxqt.installfile index 3c5f9e4..a78aca7 100644 --- a/configs/live/armv7-lxqt.installfile +++ b/configs/live/armv7-lxqt.installfile @@ -1,11 +1,2 @@ -# Install LXQt and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-lxqt - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/armv7.installfile +inherit ../base/lxqt.installfile diff --git a/configs/live/armv7-mate.installfile b/configs/live/armv7-mate.installfile index ece4aad..f93a63c 100644 --- a/configs/live/armv7-mate.installfile +++ b/configs/live/armv7-mate.installfile @@ -1,11 +1,2 @@ -# Install MATE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-mate - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/armv7.installfile +inherit ../base/mate.installfile diff --git a/configs/live/pmmx-kde.installfile b/configs/live/pmmx-kde.installfile index 630644e..31100e6 100644 --- a/configs/live/pmmx-kde.installfile +++ b/configs/live/pmmx-kde.installfile @@ -1,11 +1,2 @@ -# Install KDE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-kde - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/pmmx.installfile +inherit ../base/kde.installfile diff --git a/configs/live/pmmx-lxqt.installfile b/configs/live/pmmx-lxqt.installfile index df4801b..2f5ae8d 100644 --- a/configs/live/pmmx-lxqt.installfile +++ b/configs/live/pmmx-lxqt.installfile @@ -1,11 +1,2 @@ -# Install LXQt and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-lxqt - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/pmmx.installfile +inherit ../base/lxqt.installfile diff --git a/configs/live/pmmx-mate.installfile b/configs/live/pmmx-mate.installfile index fb3280d..088a51d 100644 --- a/configs/live/pmmx-mate.installfile +++ b/configs/live/pmmx-mate.installfile @@ -1,11 +1,2 @@ -# Install MATE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-mate - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/pmmx.installfile +inherit ../base/mate.installfile diff --git a/configs/live/ppc-kde.installfile b/configs/live/ppc-kde.installfile index e5eaae6..ab3b65d 100644 --- a/configs/live/ppc-kde.installfile +++ b/configs/live/ppc-kde.installfile @@ -1,11 +1,2 @@ -# Install KDE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-kde - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/ppc.installfile +inherit ../base/kde.installfile diff --git a/configs/live/ppc-lxqt.installfile b/configs/live/ppc-lxqt.installfile index 2add552..13cb385 100644 --- a/configs/live/ppc-lxqt.installfile +++ b/configs/live/ppc-lxqt.installfile @@ -1,11 +1,2 @@ -# Install LXQt and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-lxqt - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/ppc.installfile +inherit ../base/lxqt.installfile diff --git a/configs/live/ppc-mate.installfile b/configs/live/ppc-mate.installfile index 3e1702d..b3ba41f 100644 --- a/configs/live/ppc-mate.installfile +++ b/configs/live/ppc-mate.installfile @@ -1,11 +1,2 @@ -# Install MATE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-mate - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/ppc.installfile +inherit ../base/mate.installfile diff --git a/configs/live/ppc64-kde.installfile b/configs/live/ppc64-kde.installfile index 9b3a050..ec797c5 100644 --- a/configs/live/ppc64-kde.installfile +++ b/configs/live/ppc64-kde.installfile @@ -1,11 +1,2 @@ -# Install KDE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-kde - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/ppc64.installfile +inherit ../base/kde.installfile diff --git a/configs/live/ppc64-lxqt.installfile b/configs/live/ppc64-lxqt.installfile index 13ba266..e12944b 100644 --- a/configs/live/ppc64-lxqt.installfile +++ b/configs/live/ppc64-lxqt.installfile @@ -1,11 +1,2 @@ -# Install LXQt and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-lxqt - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/ppc64.installfile +inherit ../base/lxqt.installfile diff --git a/configs/live/ppc64-mate.installfile b/configs/live/ppc64-mate.installfile index 7b9ac5a..6e6f301 100644 --- a/configs/live/ppc64-mate.installfile +++ b/configs/live/ppc64-mate.installfile @@ -1,11 +1,2 @@ -# Install MATE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-mate - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/ppc64.installfile +inherit ../base/mate.installfile diff --git a/configs/live/x86_64-kde.installfile b/configs/live/x86_64-kde.installfile index ca8b095..ee01c9f 100644 --- a/configs/live/x86_64-kde.installfile +++ b/configs/live/x86_64-kde.installfile @@ -1,11 +1,2 @@ -# Install KDE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-kde - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/x86_64.installfile +inherit ../base/kde.installfile diff --git a/configs/live/x86_64-lxqt.installfile b/configs/live/x86_64-lxqt.installfile index 2d2ae57..0e64fa9 100644 --- a/configs/live/x86_64-lxqt.installfile +++ b/configs/live/x86_64-lxqt.installfile @@ -1,11 +1,2 @@ -# Install LXQt and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-lxqt - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/x86_64.installfile +inherit ../base/lxqt.installfile diff --git a/configs/live/x86_64-mate.installfile b/configs/live/x86_64-mate.installfile index 709b85f..ae312b5 100644 --- a/configs/live/x86_64-mate.installfile +++ b/configs/live/x86_64-mate.installfile @@ -1,11 +1,2 @@ -# Install MATE and SDDM auto-login for it -pkginstall livecd-support-horizon livecd-support-mate - -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable sddm -svcenable wpa_supplicant - inherit ../arch/x86_64.installfile +inherit ../base/mate.installfile -- cgit v1.2.3-70-g09d2