diff --git a/base.sh b/base.sh index e79ee92..525b1b2 100644 --- a/base.sh +++ b/base.sh @@ -204,7 +204,7 @@ if [[ $configuration == 1 ]]; then cp "$(find "${PWD}" -type f -name 20-wwan.network)" /etc/systemd/network/ elif [[ $configuration == 2 ]]; then - pacman -S fwupd networkmanager modemmanager avahi bluez bluez-utils sshfs pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 pipewire-docs pipewire-roc helvum wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base xdg-desktop-portal-gnome espeak-ng networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon plymouth + pacman -S fwupd networkmanager modemmanager avahi bluez bluez-utils sshfs pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 pipewire-docs pipewire-roc helvum wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base xdg-desktop-portal-gnome espeak-ng networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon pacman -S gnome gdm gnome-software-packagekit-plugin @@ -241,11 +241,7 @@ fi sed -i 's/BINARIES=()/BINARIES=(btrfs)/' /etc/mkinitcpio.conf -sed -i 's/^HOOKS=(.*)/HOOKS=(base systemd keyboard autodetect sd-vconsole modconf kms block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf - -if [[ $configuration == 2 ]]; then - sed -i 's/^HOOKS=(.*)/HOOKS=(base systemd keyboard plymouth autodetect sd-vconsole modconf kms block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf -fi +sed -i 's/HOOKS=(.*)/HOOKS=(base systemd keyboard autodetect sd-vconsole modconf kms block sd-encrypt filesystems fsck)/' /etc/mkinitcpio.conf if [[ $kernel == 1 ]]; then mkinitcpio -p linux diff --git a/prep-BTRFS-UEFI-Encrypted.sh b/prep-BTRFS-UEFI-Encrypted.sh index fa25386..d724578 100644 --- a/prep-BTRFS-UEFI-Encrypted.sh +++ b/prep-BTRFS-UEFI-Encrypted.sh @@ -8,8 +8,6 @@ localectl set-keymap de-latin1-nodeadkeys timedatectl set-timezone Europe/Berlin timedatectl set-ntp yes -lsblk -echo "-------------------------------------" echo "Choose Device (Defaults to /dev/sda):" echo "1) /dev/sda 2) /dev/vda 3) Other Path" read -r choise