diff options
Diffstat (limited to 'install.sh')
| -rw-r--r-- | install.sh | 41 |
1 files changed, 26 insertions, 15 deletions
@@ -212,9 +212,10 @@ fi basestrap /mnt --needed \ linux linux-firmware \ grub efibootmgr os-prober \ - btrfs-progs artools-base alsa-utils \ + mkinitcpio-nfs-utils btrfs-progs \ + artools-base alsa-utils \ nano vim git man-{db,pages} \ - bc btop tmux acpi + bc btop tmux acpi openresolv # Extra packages basestrap /mnt --needed \ @@ -307,7 +308,7 @@ if [[ "${greeter}" == greetd ]]; then # set tuigreet as greetd command tuigreet_args="\ --cmd '/bin/tmux new -s TMUX' \ ---power-shutdown 'sudo halt' \ +--power-shutdown 'sudo poweroff' \ --power-reboot 'sudo reboot' \ --power-no-setsid \ --asterisks \ @@ -363,14 +364,17 @@ sed "s/ENABLED=no/ENABLED=yes/" -i /mnt/etc/ufw/ufw.conf if [[ "${elogind}" == false ]]; then # Manage rundir with turnstile when not using elogind sed "s/manage_rundir = no/manage_rundir = yes/" -i /mnt/etc/turnstile/turnstiled.conf +else + # Enable iwd's DHCP client (in-place of dhcpcd when using elogind) + [[ ! -d /mnt/etc/iwd ]] && mkdir /mnt/etc/iwd + echo " +[General] +EnableNetworkConfiguration=true -# FIXME: iwd DHCP client not working -# else -# # Enable iwd's DHCP client (in-place of dhcpcd when using elogind) -# [[ ! -d /mnt/etc/iwd ]] && mkdir /mnt/etc/iwd -# printf "[General]\nEnableNetworkConfiguration=true\n" > /mnt/etc/iwd/main.conf -# unlink /mnt/etc/dinit.d/boot.d/dhcpcd - +[Network] +NameResolvingService=resolvconf +" > /mnt/etc/iwd/main.conf + unlink /mnt/etc/dinit.d/boot.d/dhcpcd fi # Set MAKEFLAGS to match CPU threads for faster compiling @@ -378,15 +382,22 @@ cp /etc/makepkg.conf /etc/makepkg.conf.bak sed "s/#MAKEFLAGS=\".*\"/MAKEFLAGS=\"-j$(nproc)\"/" \ -i /mnt/etc/makepkg.conf +# Configure mkinitcpio.conf +modules="btrfs" +sed "s/^MODULES=(.*)/MODULES=(${modules})/" -i /mnt/etc/mkinitcpio.conf + +if [[ "${encrypt}" == true ]]; then + hooks="base udev autodetect modconf kms keyboard keymap block encrypt resume filesystems fsck" + sed "s/^HOOKS=(.*)/HOOKS=(${hooks})/" -i /mnt/etc/mkinitcpio.conf +fi + +# Rebuild ram-disk environment for Linux kernel +artix-chroot /mnt bash -c "mkinitcpio -p linux" + # Configure booster echo "compress: zstd -9 -T0 modules: btrfs" > /mnt/etc/booster.yaml artix-chroot /mnt bash -c "/usr/lib/booster/regenerate_images" -# Add to GRUB -echo " -# Add Booster as custom initrd -GRUB_EARLY_INITRD_LINUX_CUSTOM=booster-linux.img -" >> /mnt/etc/default/grub # SETUP BOOT LOADER # -------------------------------------------------------------------- |