diff options
| -rwxr-xr-x | nais | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -10,9 +10,7 @@ export BOOT_MODE=bios set_system_disk() { disk=$(lsblk --raw -o TYPE,NAME,SIZE,MODEL | grep disk | sed 's/disk//g' | column -s ' ' -t | sed 's/\\x20/ /g' | bemenu -p "Select Disk" | awk '{ print $1 }') - uuid=$(lsblk --raw -o NAME,UUID | grep "$disk" | awk '{ print $2 }') export DISK="$disk" - export ROOTUUID="$uuid" } set_username_and_password() { @@ -88,6 +86,8 @@ install_arch() { mount /dev/mapper/root /mnt/ || exit btrfs subvolume create /mnt/home || exit + uuid=$(lsblk --raw -o PATH,UUID | grep "$root" | awk '{ print $2 }') + echo "$PASSWORD" | cryptsetup luksFormat --type luks1 "$boot" - || exit echo "$PASSWORD" | cryptsetup open --key-file - "$boot" boot || exit mkfs.vfat /dev/mapper/boot || exit @@ -95,7 +95,7 @@ install_arch() { [ "$BOOT_MODE" = "uefi" ] && mount --mkdir "$efi" /mnt/boot/EFI - pacstrap -K /mnt base linux linux-firmware neovim neomutt wayland wayland-protocols wlroots xorg-xwayland git base-devel networkmanager btrfs-progs sudo grub + pacstrap -K /mnt base linux linux-firmware neovim neomutt wayland wayland-protocols wlroots xorg-xwayland git base-devel networkmanager btrfs-progs sudo grub efibootmgr dd if=/dev/random of=/mnt/etc/.bootkey bs=1024 count=4 echo "$PASSWORD" | cryptsetup luksAddKey --key-file - "$boot" /mnt/etc/.bootkey || exit |