@ -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,36 +348,7 @@ clear
arch-chroot /mnt pacman -Sy --quiet --noconfirm
arch-chroot /mnt pacman -Sy --quiet --noconfirm
while [ [ " $DE " = = "" ] ] ; do
#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
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
DE = $( dialog --title "Citrine" --menu "Please choose the DE you want to install" 12 100 2 "Onyx" "Our custom Desktop Environment based on XFCE" "Onyx tiling" "Our custom Desktop Environment based on xfce but with i3 as the wm" --stdout)
DE = $( dialog --title "Citrine" --menu "Please choose the DE you want to install" 12 100 2 "Onyx" "Our custom Desktop Environment based on XFCE" "Onyx tiling" "Our custom Desktop Environment based on xfce but with i3 as the wm" --stdout)
@ -423,41 +365,40 @@ arch-chroot /mnt pacman -Sy --quiet --noconfirm
DE = ""
DE = ""
fi
fi
fi
fi
done
done
if [ [ " $DE " = = "Onyx" ] ] ; then
if [ [ " $DE " = = "Onyx" ] ] ; then
#arch-chroot /mnt pacman -S --quiet --noconfirm onyx
#arch-chroot /mnt pacman -S --quiet --noconfirm onyx
#DM="lightdm"
#DM="lightdm"
dumptitle = "Desktop Environment"
dumptitle = "Desktop Environment"
dump "Onyx is not supported yet, please choose another DE"
dump "Onyx is not supported yet, please choose another DE"
DE = ""
DE = ""
elif [ [ " $DE " = = "Onyx tiling" ] ] ; then
elif [ [ " $DE " = = "Onyx tiling" ] ] ; then
#arch-chroot /mnt pacman -S --quiet --noconfirm onyx-tiling
#arch-chroot /mnt pacman -S --quiet --noconfirm onyx-tiling
#DM="lightdm"
#DM="lightdm"
dumptitle = "Desktop Environment"
dumptitle = "Desktop Environment"
dump "Onyx is not supported yet, please choose another DE"
dump "Onyx is not supported yet, please choose another DE"
DE = ""
DE = ""
elif [ [ " $DE " = = "Gnome" ] ] ; then
elif [ [ " $DE " = = "Gnome" ] ] ; then
arch-chroot /mnt pacman -S --quiet --noconfirm gnome gnome-extra chrome-gnome-shell
arch-chroot /mnt pacman -S --quiet --noconfirm gnome gnome-extra chrome-gnome-shell
DM = "gdm"
DM = "gdm"
elif [ [ " $DE " = = "KDE" ] ] ; then
elif [ [ " $DE " = = "KDE" ] ] ; then
arch-chroot /mnt pacman -S --quiet --noconfirm plasma kde-applications sddm
arch-chroot /mnt pacman -S --quiet --noconfirm plasma kde-applications sddm
DM = "sddm"
DM = "sddm"
elif [ [ " $DE " = = "budgie" ] ] ; then
elif [ [ " $DE " = = "budgie" ] ] ; then
arch-chroot /mnt pacman -S --quiet --noconfirm budgie-desktop gnome
arch-chroot /mnt pacman -S --quiet --noconfirm budgie-desktop gnome
DM = "gdm"
DM = "gdm"
elif [ [ " $DE " = = "Mate" ] ] ; then
elif [ [ " $DE " = = "Mate" ] ] ; then
arch-chroot /mnt pacman -S --quiet --noconfirm mate mate-extra mate-applet-dock mate-applet-streamer
arch-chroot /mnt pacman -S --quiet --noconfirm mate mate-extra mate-applet-dock mate-applet-streamer
DM = "gdm"
DM = "gdm"
elif [ [ " $DE " = = "Pantheon" ] ] ; then
elif [ [ " $DE " = = "Pantheon" ] ] ; then
arch-chroot /mnt su - ${ UN } -c "ame -S gala wingpanel pantheon-applications-menu plank pantheon-geoclue2-agent pantheon-polkit-agent pantheon-print pantheon-settings-daemon lightdm lightdm-pantheon-greeter pantheon-default-settings elementary-icon-theme elementary-wallpapers gtk-theme-elementary ttf-droid ttf-opensans ttf-roboto sound-theme-elementary capnet-assist epiphany pantheon-calculator pantheon-calendar pantheon-camera pantheon-code pantheon-files pantheon-mail pantheon-music pantheon-photos pantheon-screencast pantheon-shortcut-overlay pantheon-terminal pantheon-videos simple-scan pantheon-session pantheon switchboard-plugin-desktop" > /mnt/pantheon-packages.txt
arch-chroot /mnt su - ${ UN } -c "ame -S gala wingpanel pantheon-applications-menu plank pantheon-geoclue2-agent pantheon-polkit-agent pantheon-print pantheon-settings-daemon lightdm lightdm-pantheon-greeter pantheon-default-settings elementary-icon-theme elementary-wallpapers gtk-theme-elementary ttf-droid ttf-opensans ttf-roboto sound-theme-elementary capnet-assist epiphany pantheon-calculator pantheon-calendar pantheon-camera pantheon-code pantheon-files pantheon-mail pantheon-music pantheon-photos pantheon-screencast pantheon-shortcut-overlay pantheon-terminal pantheon-videos simple-scan pantheon-session pantheon switchboard-plugin-desktop" > /mnt/pantheon-packages.txt
DM = "lightdm"
DM = "lightdm"
elif [ [ " $DE " = = "Enlightenment" ] ] ; then
elif [ [ " $DE " = = "Enlightenment" ] ] ; then
arch-chroot /mnt pacman -S --quiet --noconfirm enlightenment terminology
arch-chroot /mnt pacman -S --quiet --noconfirm enlightenment terminology
elif [ [ " $DE " = = "Xfce" ] ] ; then
elif [ [ " $DE " = = "Xfce" ] ] ; then
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"