diff --git a/etc/base b/etc/base index 0ee4658..1785774 100644 --- a/etc/base +++ b/etc/base @@ -1,5 +1,5 @@ packages() { - addpkg base-system lvm2 cryptsetup htop tmux wireguard-tools + addpkg base-system lvm2 cryptsetup htop wireguard-tools } config() { diff --git a/etc/de/plasma b/etc/de/plasma index 4162715..526e613 100644 --- a/etc/de/plasma +++ b/etc/de/plasma @@ -1,8 +1,10 @@ packages() { - addpkg "sddm" "kde5" + addpkg "sddm" "kde5" "konsole" } config() { enable_service "sddm" - echo "export LANG=${L1}.UTF-8" > /etc/sv/sddm/conf + if ! [ "$LANGUAGE" == "en" ]; then + echo "export LANG=${L1}.UTF-8" > /etc/sv/sddm/conf + fi } \ No newline at end of file diff --git a/main.sh b/main.sh index 1984072..bee3da6 100644 --- a/main.sh +++ b/main.sh @@ -210,13 +210,18 @@ lang() { } bootloader() { - if [ "$EFI" == "1" ]; then - addpkg grub-x86_64-efi dracut-uefi - else - addpkg grub + for i in $(find recipes/bootloader); do + bl+=("$(basename $i)") + done + if [ "${#bl[@]}" -gt "1" ]; then + multiplechoice "${bl[@]}" fi } +network() { + multiplechoice "NetworkManager" "dhcpcd" "iwd" +} + do_install() { mkdir -p ${target}/var/db/xbps/keys cp /var/db/xbps/keys/* ${target}/var/db/xbps/keys @@ -227,10 +232,12 @@ do_chroot() { mkdir -p ${target}/tmp/vinstaller/run cp ./etc/base ${target}/tmp/vinstaller/run + cp ./etc/functions ${target}/tmp/vinstaller/run if ! [ "$DE" == "minimal" ]; then cp ./etc/gfx/$GFX ${target}/tmp/vinstaller/run cp ./etc/soundsystem/$SOUNDSYSTEM ${target}/tmp/vinstaller/run cp ./etc/de/$DE ${target}/tmp/vinstaller/run + cp ./etc/x11 ${target}/tmp/vinstaller/run fi echo "USERNAME=$USERNAME" > ${target}/tmp/vinstaller/vars @@ -245,11 +252,11 @@ do_chroot() { cat < ${target}/tmp/vinstaller/main_chroot #!/bin/bash . /tmp/vinstaller/vars +. /tmp/vinstaller/functions for file in \$(find /tmp/vinstaller/run -type f); do . \$file config done -exit EOF chmod +x ${target}/tmp/vinstaller/main_chroot diff --git a/recipes/bootloader/grub b/recipes/bootloader/grub new file mode 100644 index 0000000..1084278 --- /dev/null +++ b/recipes/bootloader/grub @@ -0,0 +1,7 @@ +packages() { + if [ "$EFI" == "1" ]; then + addpkg grub-x86_64-efi dracut-uefi + else + addpkg grub + fi +} \ No newline at end of file