configs: Reorganise, add KDE/LXQt/MATE live spins

30 files changed, 178 insertions, 12 deletions

diff --git a/configs/pmmx.installfile b/configs/arch/pmmx.installfile
index f3eedc5..f3eedc5 100644
--- a/configs/pmmx.installfile
+++ b/configs/arch/pmmx.installfile
diff --git a/configs/power.installfile b/configs/arch/power.installfile
index 1547db1..74944f5 100644
--- a/configs/power.installfile
+++ b/configs/arch/power.installfile
@@ -4,4 +4,4 @@ pkginstall grub-ieee1275 mac-fdisk
 signingkey https://distfiles.adelielinux.org/adelie/keys/powerpc-1@packages.adelielinux.org.pub
 signingkey https://distfiles.adelielinux.org/adelie/keys/powerpc-2@packages.adelielinux.org.pub
 
-inherit base.installfile
+inherit ../base/base.installfile
diff --git a/configs/ppc.installfile b/configs/arch/ppc.installfile
index c2c63f1..c2c63f1 100644
--- a/configs/ppc.installfile
+++ b/configs/arch/ppc.installfile
diff --git a/configs/ppc64.installfile b/configs/arch/ppc64.installfile
index c0ba925..c0ba925 100644
--- a/configs/ppc64.installfile
+++ b/configs/arch/ppc64.installfile
diff --git a/configs/x86.installfile b/configs/arch/x86.installfile
index 8d6e9c3..1cdcebf 100644
--- a/configs/x86.installfile
+++ b/configs/arch/x86.installfile
@@ -4,4 +4,4 @@ pkginstall dmidecode efibootmgr grub-bios grub-efi mactel-boot strace
 signingkey https://distfiles.adelielinux.org/adelie/keys/x86-1@packages.adelielinux.org.pub
 signingkey https://distfiles.adelielinux.org/adelie/keys/x86-2@packages.adelielinux.org.pub
 
-inherit base.installfile
+inherit ../base/base.installfile
diff --git a/configs/x86_64.installfile b/configs/arch/x86_64.installfile
index d7d0a6f..d7d0a6f 100644
--- a/configs/x86_64.installfile
+++ b/configs/arch/x86_64.installfile
diff --git a/configs/base.installfile b/configs/base/base.installfile
index 568811f..7ede420 100644
--- a/configs/base.installfile
+++ b/configs/base/base.installfile
@@ -11,8 +11,8 @@ nameserver 149.112.112.112
 pkginstall adelie-base-posix dash-binsh ssmtp s6-linux-init s6-linux-init-early-getty openrc eudev
 # Disk setup
 pkginstall parted cryptsetup diskdev_cmds dosfstools e2fsprogs jfsutils lvm2 mdadm xfsprogs-base
-# Kernel / boot
-pkginstall easy-kernel easy-kernel-modules dracut
+# Kernel / boot (we take care of boot cfg ourselves, so no-boot vs easy-boot)
+pkginstall easy-kernel easy-kernel-modules dracut no-boot
 # Networking
 pkginstall ca-certificates curl dhcpcd iproute2 iputils mtr net-tools netifrc netifrc-doc s6-dns traceroute
 # Wi-Fi
@@ -26,3 +26,4 @@ pkginstall bzip2 gnupg kbd-keymaps less links lzop nano openssh tmux
 username live
 useralias live Live User
 usergroups live users,audio,video,cdrom,games,floppy,cdrw,ping
+pkginstall livecd-support
diff --git a/configs/base/kde.installfile b/configs/base/kde.installfile
new file mode 100644
index 0000000..e6b3758
--- /dev/null
+++ b/configs/base/kde.installfile
@@ -0,0 +1,11 @@
+# Install KDE and SDDM auto-login for it.
+pkginstall livecd-support-kde
+
+# Start X on boot, if possible.
+svcenable udev boot
+svcenable udev-trigger boot
+svcenable elogind
+svcenable sddm
+svcenable wpa_supplicant
+
+inherit base.installfile
diff --git a/configs/base/lxqt.installfile b/configs/base/lxqt.installfile
new file mode 100644
index 0000000..b433353
--- /dev/null
+++ b/configs/base/lxqt.installfile
@@ -0,0 +1,11 @@
+# Install LXQt and SDDM auto-login for it.
+pkginstall livecd-support-lxqt
+
+# Start X on boot, if possible.
+svcenable udev boot
+svcenable udev-trigger boot
+svcenable elogind
+svcenable sddm
+svcenable wpa_supplicant
+
+inherit base.installfile
diff --git a/configs/base/mate.installfile b/configs/base/mate.installfile
new file mode 100644
index 0000000..b15f797
--- /dev/null
+++ b/configs/base/mate.installfile
@@ -0,0 +1,11 @@
+# Install MATE and SDDM auto-login for it.
+pkginstall livecd-support-mate
+
+# Start X on boot, if possible.
+svcenable udev boot
+svcenable udev-trigger boot
+svcenable elogind
+svcenable sddm
+svcenable wpa_supplicant
+
+inherit base.installfile
diff --git a/configs/ppc64-live-fw.installfile b/configs/horizon/pmmx-horizon-fw.installfile
index a5407fa..580c61e 100644
--- a/configs/ppc64-live-fw.installfile
+++ b/configs/horizon/pmmx-horizon-fw.installfile
@@ -3,4 +3,4 @@ firmware true
 signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub
 signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub
 
-inherit ppc64-live.installfile
+inherit pmmx-horizon.installfile
diff --git a/configs/ppc-live.installfile b/configs/horizon/pmmx-horizon.installfile
index e2f59ae..956843b 100644
--- a/configs/ppc-live.installfile
+++ b/configs/horizon/pmmx-horizon.installfile
@@ -8,4 +8,4 @@ svcenable elogind
 svcenable sddm
 svcenable wpa_supplicant
 
-inherit ppc.installfile
+inherit ../arch/pmmx.installfile
diff --git a/configs/pmmx-live-fw.installfile b/configs/horizon/ppc-horizon-fw.installfile
index 0f9dd5e..e462b44 100644
--- a/configs/pmmx-live-fw.installfile
+++ b/configs/horizon/ppc-horizon-fw.installfile
@@ -3,4 +3,4 @@ firmware true
 signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub
 signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub
 
-inherit pmmx-live.installfile
+inherit ppc-horizon.installfile
diff --git a/configs/pmmx-live.installfile b/configs/horizon/ppc-horizon.installfile
index 47f8a3c..a0f2ec2 100644
--- a/configs/pmmx-live.installfile
+++ b/configs/horizon/ppc-horizon.installfile
@@ -8,4 +8,4 @@ svcenable elogind
 svcenable sddm
 svcenable wpa_supplicant
 
-inherit pmmx.installfile
+inherit ../arch/ppc.installfile
diff --git a/configs/ppc-live-fw.installfile b/configs/horizon/ppc64-horizon-fw.installfile
index 9479b89..d4dea36 100644
--- a/configs/ppc-live-fw.installfile
+++ b/configs/horizon/ppc64-horizon-fw.installfile
@@ -3,4 +3,4 @@ firmware true
 signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub
 signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub
 
-inherit ppc-live.installfile
+inherit ppc64-horizon.installfile
diff --git a/configs/ppc64-live.installfile b/configs/horizon/ppc64-horizon.installfile
index 5e521f3..e9cd27f 100644
--- a/configs/ppc64-live.installfile
+++ b/configs/horizon/ppc64-horizon.installfile
@@ -8,4 +8,4 @@ svcenable elogind
 svcenable sddm
 svcenable wpa_supplicant
 
-inherit ppc64.installfile
+inherit ../arch/ppc64.installfile
diff --git a/configs/x86_64-live-fw.installfile b/configs/horizon/x86_64-horizon-fw.installfile
index 9a167e2..1b1795a 100644
--- a/configs/x86_64-live-fw.installfile
+++ b/configs/horizon/x86_64-horizon-fw.installfile
@@ -3,4 +3,4 @@ firmware true
 signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac04808.rsa.pub
 signingkey https://distfiles.adelielinux.org/adelie/keys/packages@pleroma.apkfission.net-5ac0b300.rsa.pub
 
-inherit x86_64-live.installfile
+inherit x86_64-horizon.installfile
diff --git a/configs/x86_64-live.installfile b/configs/horizon/x86_64-horizon.installfile
index a3090f1..523cc8f 100644
--- a/configs/x86_64-live.installfile
+++ b/configs/horizon/x86_64-horizon.installfile
@@ -8,4 +8,4 @@ svcenable elogind
 svcenable sddm
 svcenable wpa_supplicant
 
-inherit x86_64.installfile
+inherit ../arch/x86_64.installfile
diff --git a/configs/live/pmmx-kde.installfile b/configs/live/pmmx-kde.installfile
new file mode 100644
index 0000000..9d3f126
--- /dev/null
+++ b/configs/live/pmmx-kde.installfile
@@ -0,0 +1,11 @@
+# Install KDE and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/pmmx-lxqt.installfile b/configs/live/pmmx-lxqt.installfile
new file mode 100644
index 0000000..51b5a22
--- /dev/null
+++ b/configs/live/pmmx-lxqt.installfile
@@ -0,0 +1,11 @@
+# Install LXQt and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/pmmx-mate.installfile b/configs/live/pmmx-mate.installfile
new file mode 100644
index 0000000..fe1cdc9
--- /dev/null
+++ b/configs/live/pmmx-mate.installfile
@@ -0,0 +1,11 @@
+# Install MATE and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/ppc-kde.installfile b/configs/live/ppc-kde.installfile
new file mode 100644
index 0000000..9d3f126
--- /dev/null
+++ b/configs/live/ppc-kde.installfile
@@ -0,0 +1,11 @@
+# Install KDE and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/ppc-lxqt.installfile b/configs/live/ppc-lxqt.installfile
new file mode 100644
index 0000000..51b5a22
--- /dev/null
+++ b/configs/live/ppc-lxqt.installfile
@@ -0,0 +1,11 @@
+# Install LXQt and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/ppc-mate.installfile b/configs/live/ppc-mate.installfile
new file mode 100644
index 0000000..fe1cdc9
--- /dev/null
+++ b/configs/live/ppc-mate.installfile
@@ -0,0 +1,11 @@
+# Install MATE and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/ppc64-kde.installfile b/configs/live/ppc64-kde.installfile
new file mode 100644
index 0000000..9d3f126
--- /dev/null
+++ b/configs/live/ppc64-kde.installfile
@@ -0,0 +1,11 @@
+# Install KDE and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/ppc64-lxqt.installfile b/configs/live/ppc64-lxqt.installfile
new file mode 100644
index 0000000..51b5a22
--- /dev/null
+++ b/configs/live/ppc64-lxqt.installfile
@@ -0,0 +1,11 @@
+# Install LXQt and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/ppc64-mate.installfile b/configs/live/ppc64-mate.installfile
new file mode 100644
index 0000000..fe1cdc9
--- /dev/null
+++ b/configs/live/ppc64-mate.installfile
@@ -0,0 +1,11 @@
+# Install MATE and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/x86_64-kde.installfile b/configs/live/x86_64-kde.installfile
new file mode 100644
index 0000000..9d3f126
--- /dev/null
+++ b/configs/live/x86_64-kde.installfile
@@ -0,0 +1,11 @@
+# Install KDE and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/x86_64-lxqt.installfile b/configs/live/x86_64-lxqt.installfile
new file mode 100644
index 0000000..51b5a22
--- /dev/null
+++ b/configs/live/x86_64-lxqt.installfile
@@ -0,0 +1,11 @@
+# Install LXQt and SDDM auto-login for it.
+pkginstall 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
diff --git a/configs/live/x86_64-mate.installfile b/configs/live/x86_64-mate.installfile
new file mode 100644
index 0000000..75c550e
--- /dev/null
+++ b/configs/live/x86_64-mate.installfile
@@ -0,0 +1,11 @@
+# Install MATE and SDDM auto-login for it
+pkginstall 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