From 00167437fade5d44a152ec2dd60d193ffa086eae Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 26 Nov 2023 05:55:26 -0600 Subject: Base configurations: DRY the desktop env configs Factor all of the repeated logic into a single 'live-base' script. --- configs/base/kde.installfile | 14 +++----------- configs/base/live-base.installfile | 15 +++++++++++++++ configs/base/lxqt.installfile | 13 +++---------- configs/base/mate.installfile | 13 +++---------- configs/base/xfce.installfile | 13 +++---------- 5 files changed, 27 insertions(+), 41 deletions(-) create mode 100644 configs/base/live-base.installfile diff --git a/configs/base/kde.installfile b/configs/base/kde.installfile index 4e47751..57c3bb4 100644 --- a/configs/base/kde.installfile +++ b/configs/base/kde.installfile @@ -1,12 +1,4 @@ -# Install KDE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-kde networkmanager +# Install KDE. +pkginstall livecd-support-kde -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable bluetooth graphical -svcenable elogind -svcenable NetworkManager -svcenable chronyd graphical -svcenable sddm graphical -svcenable wpa_supplicant +inherit live-base.installfile diff --git a/configs/base/live-base.installfile b/configs/base/live-base.installfile new file mode 100644 index 0000000..c88d69a --- /dev/null +++ b/configs/base/live-base.installfile @@ -0,0 +1,15 @@ +# Install the Live CD support files, Bluetooth support, and NetworkManager. +pkginstall bluez livecd-support-horizon networkmanager + +# Install all available documentation. +# pkginstall docs + +# Start X on boot, if possible. +svcenable udev boot +svcenable udev-trigger boot +svcenable elogind +svcenable wpa_supplicant +svcenable NetworkManager +svcenable bluetooth graphical +svcenable chronyd graphical +svcenable sddm graphical diff --git a/configs/base/lxqt.installfile b/configs/base/lxqt.installfile index c2b619f..f06afef 100644 --- a/configs/base/lxqt.installfile +++ b/configs/base/lxqt.installfile @@ -1,11 +1,4 @@ -# Install LXQt and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-lxqt networkmanager +# Install LXQt. +pkginstall livecd-support-lxqt -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable NetworkManager -svcenable chronyd graphical -svcenable sddm graphical -svcenable wpa_supplicant +inherit live-base.installfile diff --git a/configs/base/mate.installfile b/configs/base/mate.installfile index 359a1b8..6b2edad 100644 --- a/configs/base/mate.installfile +++ b/configs/base/mate.installfile @@ -1,11 +1,4 @@ -# Install MATE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-mate networkmanager +# Install MATE. +pkginstall livecd-support-mate -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable NetworkManager -svcenable chronyd graphical -svcenable sddm graphical -svcenable wpa_supplicant +inherit live-base.installfile diff --git a/configs/base/xfce.installfile b/configs/base/xfce.installfile index ec29354..fe2abbe 100644 --- a/configs/base/xfce.installfile +++ b/configs/base/xfce.installfile @@ -1,11 +1,4 @@ -# Install XFCE and SDDM auto-login for it. -pkginstall livecd-support-horizon livecd-support-xfce networkmanager +# Install XFCE. +pkginstall livecd-support-xfce -# Start X on boot, if possible. -svcenable udev boot -svcenable udev-trigger boot -svcenable elogind -svcenable NetworkManager -svcenable chronyd graphical -svcenable sddm graphical -svcenable wpa_supplicant +inherit live-base.installfile -- cgit v1.2.3-60-g2f50