@ -136,32 +136,12 @@ if [[ "$MANUAL" == "no" ]]; then
mkfs.vfat ${ DISK } p1
mkfs.vfat ${ DISK } p1
mkfs.btrfs -f ${ DISK } p2
mkfs.btrfs -f ${ DISK } p2
mount ${ DISK } p2 /mnt
mount ${ DISK } p2 /mnt
cd /mnt
mkdir -p /mnt/boot/efi
btrfs subvolume create @
btrfs subvolume create @home
btrfs subvolume create @var
cd /
umount /mnt
mount -o noatime,compress= zstd,subvol= @ ${ DISK } p2 /mnt
mkdir -p /mnt/{ home,var,boot/efi}
mount -o noatime,compress= zstd,subvol= @home ${ DISK } p2 /mnt/home
mount -o noatime,compress= zstd,subvol= @var ${ DISK } p2 /mnt/var
mount ${ DISK } p1 /mnt/boot/efi
mount ${ DISK } p1 /mnt/boot/efi
else
else
inf " Initializing ${ DISK } as NVME MBR "
inf " Initializing ${ DISK } as NVME MBR "
mkfs.btrfs -f ${ DISK } p1
mkfs.btrfs -f ${ DISK } p1
mount ${ DISK } p1 /mnt
mount ${ DISK } p1 /mnt
cd /mnt
btrfs subvolume create @
btrfs subvolume create @home
btrfs subvolume create @var
cd /
umount /mnt
mount -o noatime,compress= zstd,subvol= @ ${ DISK } p1 /mnt
mkdir -p /mnt/{ home,var}
mount -o noatime,compress= zstd,subvol= @home ${ DISK } p1 /mnt/home
mount -o noatime,compress= zstd,subvol= @var ${ DISK } p1 /mnt/var
mount ${ DISK } p1 /mnt
fi
fi
else
else
if [ [ " $EFI " = = "yes" ] ] ; then
if [ [ " $EFI " = = "yes" ] ] ; then
@ -169,16 +149,7 @@ if [[ "$MANUAL" == "no" ]]; then
mkfs.vfat -F32 ${ DISK } 1
mkfs.vfat -F32 ${ DISK } 1
mkfs.btrfs -f ${ DISK } 2
mkfs.btrfs -f ${ DISK } 2
mount ${ DISK } 2 /mnt
mount ${ DISK } 2 /mnt
cd /mnt
mkdir -p /mnt/boot/efi
btrfs subvolume create @
btrfs subvolume create @home
btrfs subvolume create @var
cd /
umount /mnt
mount -o noatime,compress= zstd,subvol= @ ${ DISK } 2 /mnt
mkdir -p /mnt/{ home,var,boot/efi}
mount -o noatime,compress= zstd,subvol= @home ${ DISK } 2 /mnt/home
mount -o noatime,compress= zstd,subvol= @var ${ DISK } 2 /mnt/var
mount ${ DISK } 1 /mnt/boot/efi
mount ${ DISK } 1 /mnt/boot/efi
else
else
inf " Initializing ${ DISK } as MBR "
inf " Initializing ${ DISK } as MBR "
@ -377,35 +348,6 @@ clear
arch-chroot /mnt pacman -Sy --quiet --noconfirm
arch-chroot /mnt pacman -Sy --quiet --noconfirm
#if [[ "$DEP" == "0" ]]; then
#inf "--- Desktop Environments ---"
#inf "- GNOME"
#inf "- KDE"
#inf "- Xfce"
#inf "- Budgie"
#inf "Please enter exactly as shown."
#prompt ""
#echo "DE=$response"
#DE="$response"
#DM=""
#case "$DE" in
#"Budgie" | "budgie")
# arch-chroot /mnt pacman -S --quiet --noconfirm budgie-desktop gnome
# DM="gdm"
# ;;
#"Gnome" | "GNOME" | "gnome")
# arch-chroot /mnt pacman -S --quiet --noconfirm gnome gnome-extra chrome-gnome-shell
# DM="gdm"
# ;;
#"KDE" | "Kde" | "kde")
# arch-chroot /mnt pacman -S --quiet --noconfirm plasma kde-applications sddm
# DM="sddm"
#"Xfce" | "xfce")
# arch-chroot /mnt pacman -S --quiet --noconfirm xfce4 xfce4-goodies
# DM="sddm"
# ;;
#esac
while [ [ " $DE " = = "" ] ] ; do
while [ [ " $DE " = = "" ] ] ; do
menu = $( dialog --title "Citrine" --menu "Select the Desktop Environment you want to install" 12 100 4 "Official" "Our pre-themed desktop environments" "Third Party (supported)" "Third party Desktop Environments that are supported" "Third Party (unsupported)" "Third Party Desktop Environments that aren't supported" "None/DIY" "Install no de from this list" --stdout)
menu = $( dialog --title "Citrine" --menu "Select the Desktop Environment you want to install" 12 100 4 "Official" "Our pre-themed desktop environments" "Third Party (supported)" "Third party Desktop Environments that are supported" "Third Party (unsupported)" "Third Party Desktop Environments that aren't supported" "None/DIY" "Install no de from this list" --stdout)
if [ [ " $menu " = = "Official" ] ] ; then
if [ [ " $menu " = = "Official" ] ] ; then
@ -457,7 +399,6 @@ arch-chroot /mnt pacman -Sy --quiet --noconfirm
arch-chroot /mnt pacman -S --quiet --noconfirm xfce4 xfce4-goodies
arch-chroot /mnt pacman -S --quiet --noconfirm xfce4 xfce4-goodies
DM = "lightdm"
DM = "lightdm"
fi
fi
#fi
if [ [ " $DM " = = "" ] ] ; then
if [ [ " $DM " = = "" ] ] ; then
inf "Your selected DE/WM doesn't have a standard display manager. Enter one of the below names, or leave blank for none"
inf "Your selected DE/WM doesn't have a standard display manager. Enter one of the below names, or leave blank for none"