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 From 22c8e75aef9298e5795e8a7ee2dea73104bc474f Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 26 Nov 2023 05:56:07 -0600 Subject: Base configuration: Add 'usb' group to 'live' user This group is required for our disk mounting rules in user/udisks2. Closes: adelie/packages#1114 --- configs/base/base.installfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/base/base.installfile b/configs/base/base.installfile index c6a3c48..9d6531a 100644 --- a/configs/base/base.installfile +++ b/configs/base/base.installfile @@ -31,5 +31,5 @@ repository https://distfiles.adelielinux.org/adelie/current/user # Live User username live useralias live Live User -usergroups live disk,users,audio,video,cdrom,games,floppy,cdrw,ping +usergroups live disk,users,audio,video,cdrom,games,floppy,cdrw,ping,usb pkginstall livecd-support -- cgit v1.2.3-60-g2f50 From 983a6f020d8ea8f0e719053b9d1fd53fe549fafc Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 26 Nov 2023 06:08:51 -0600 Subject: Base configuration: Install documentation Closes: #385 --- configs/base/base.installfile | 3 +++ configs/base/live-base.installfile | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/base/base.installfile b/configs/base/base.installfile index 9d6531a..45e41f3 100644 --- a/configs/base/base.installfile +++ b/configs/base/base.installfile @@ -22,6 +22,9 @@ pkginstall hdparm pciutils pcmciautils smartmontools usbutils # User convenience tools pkginstall bzip2 chrony gnupg kbd-keymaps less links lzop nano openssh tmux +# Install all available documentation. +pkginstall docs + # Enable logging by default - can be disabled with `rc-update del sysklogd` svcenable sysklogd diff --git a/configs/base/live-base.installfile b/configs/base/live-base.installfile index c88d69a..b7aad0b 100644 --- a/configs/base/live-base.installfile +++ b/configs/base/live-base.installfile @@ -1,9 +1,6 @@ # 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 -- cgit v1.2.3-60-g2f50 From f712ce80677d00f760eb6c54fd3c54282d7f70c3 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Thu, 30 Nov 2023 19:48:36 -0600 Subject: Base configuration: Live media: Add PulseAudio Ref: image#388, image#390 --- configs/base/live-base.installfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/base/live-base.installfile b/configs/base/live-base.installfile index b7aad0b..8ff3125 100644 --- a/configs/base/live-base.installfile +++ b/configs/base/live-base.installfile @@ -1,6 +1,9 @@ # Install the Live CD support files, Bluetooth support, and NetworkManager. pkginstall bluez livecd-support-horizon networkmanager +# Install PulseAudio support by default. +pkginstall pulseaudio + # Start X on boot, if possible. svcenable udev boot svcenable udev-trigger boot -- cgit v1.2.3-60-g2f50