From 4e35838787001cc3484ae56a3f614f6a3012f271 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 15 Oct 2023 20:58:45 -0600 Subject: [PATCH] fix --- debian.sh | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/debian.sh b/debian.sh index a2fd5b0..21e8618 100755 --- a/debian.sh +++ b/debian.sh @@ -6,7 +6,7 @@ # 1. BTRFS with Grub Snapshots # 2. Full-disk-encryption # 3. Hibernation -# 4. GNOME or KDE Desktop +# 4. GNOME, CINNAMON, XFCE, or KDE Desktop # 5. The ability to build a custom and deployable image onto any machine # 6. Easily create a bootable USB drive # 7. Automatic Partitioning @@ -42,12 +42,14 @@ WIRELESS_INTERFACE='wlan0' DISK_PASSWORD='123456' COMPRESSION='compress=zstd:10' AUTO_DECRYPT='True' -FLATPAKS+=(io.exodus.Exodus) +FLATPAKS+=(io.exodus.Exodus us.zoom.Zoom) DESKTOP="KDE" #Packages -BASE_PACKAGES=" neofetch linux-image-amd64 grub-efi efibootmgr plymouth plymouth-themes duperemove btrfs-compsize btrfs-progs cryptsetup-initramfs linux-headers-amd64 firmware-iwlwifi firmware-linux firmware-linux-nonfree podman-compose podman-toolbox cockpit cockpit-podman packagekit cockpit-packagekit cockpit-storaged shfmt aardvark-dns power-profiles-daemon iptables-persistent resolvconf wireguard wireguard-tools nmap libsecret-tools libglu1-mesa preload flatpak powertop acpi btop inotify-tools debootstrap cups apt-transport-https samba samba-common nfs-common nfs-kernel-server linux-cpupower locales zram-tools acpid podman ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat fuse3 build-essential unzip bash-completion parted dosfstools wget curl " +BASE_PACKAGES=" firmware-realtek neofetch linux-image-amd64 grub-efi efibootmgr plymouth plymouth-themes duperemove btrfs-compsize btrfs-progs cryptsetup-initramfs linux-headers-amd64 firmware-iwlwifi firmware-linux firmware-linux-nonfree podman-compose podman-toolbox cockpit cockpit-podman packagekit cockpit-packagekit cockpit-storaged shfmt aardvark-dns power-profiles-daemon iptables-persistent resolvconf wireguard wireguard-tools nmap libsecret-tools libglu1-mesa preload flatpak powertop acpi btop inotify-tools debootstrap cups apt-transport-https samba samba-common nfs-common nfs-kernel-server linux-cpupower locales zram-tools acpid podman ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat fuse3 build-essential unzip bash-completion parted dosfstools wget curl " KDE_DESKTOP_ENV=" keepassxc krita libdbus-glib-1-2 calligra print-manager plasma-discover-backend-flatpak kwin-addons kde-standard konsole dolphin kde-spectacle " +XFCE_DESKTOP_ENV=" xfce4 xfce4-goodies xfce4-whiskermenu-plugin xfce4-pulseaudio-plugin slim " +CINNAMON_DESKTOP_ENV=" cinnamon slim gimp " GNOME_DESKTOP_ENV=" gnome gnome-shell-extension-weather gnome-shell-extension-dashtodock gnome-shell-extension-appindicator gnome-shell-extension-gsconnect gnome-tweaks synaptic gimp " SHARED_DESKTOP_APPS=" telegram-desktop handbrake vlc nextcloud-desktop yt-dlp " #VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf cockpit-machines" @@ -199,10 +201,7 @@ decryptBoot() { KEYFILE='keyfile.key' echo echo "Setting LUKS to use Keyfile for password entry" - - - echo echo "Clearing Old Keys" echo @@ -331,6 +330,7 @@ desktop() { installCodium installVPN installSteam + hibernate-setup apt autoremove -y } @@ -489,17 +489,16 @@ installFirefox() { echo "Name=Open in private mode" >>/usr/share/applications/firefox.desktop } -installSteam(){ +installSteam() { dpkg --add-architecture i386 apt update apt install libc6:amd64 libc6:i386 libegl1:amd64 libegl1:i386 libgbm1:amd64 libgbm1:i386 libgl1-mesa-dri:amd64 libgl1-mesa-dri:i386 libgl1:amd64 libgl1:i386 steam-libs-amd64:amd64 steam-libs-i386:i386 xterm libgl1-mesa-dri:i386 mesa-vulkan-drivers:i386 -y cd /tmp wget https://steamcdn-a.akamaihd.net/client/installer/steam.deb apt install -y /tmp/steam.deb - apt install lutris -y + apt install lutris -y } - installBrowser() { #Brave curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg @@ -714,9 +713,13 @@ menu() { echo echo read -p 'Debian Version: ' -e -i "stable" DEBIAN_RELEASE - read -p 'KDE or GNOME: ' -e -i "KDE" DESKTOP + read -p 'KDE, CINNAMON, XFCE, or GNOME: ' -e -i "KDE" DESKTOP if [[ $DESKTOP = *KDE* ]]; then PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS$KDE_DESKTOP_ENV + elif [[ $DESKTOP = *XFCE* ]]; then + PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS$XFCE_DESKTOP_ENV + elif [[ $DESKTOP = *CINNAMON* ]]; then + PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS$CINNAMON_DESKTOP_ENV else PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS$GNOME_DESKTOP_ENV fi @@ -757,9 +760,13 @@ menu() { read -p 'Location to Store Image: ' -e -i "/home/$USER" image_directory read -p 'Image File Name: ' -e -i "debian" ROOT_NAME read -p 'Debian Version: ' -e -i "stable" DEBIAN_RELEASE - read -p 'KDE or GNOME: ' -e -i "KDE" DESKTOP + read -p 'KDE, CINNAMON, XFCE, or GNOME: ' -e -i "KDE" DESKTOP if [[ $DESKTOP = *KDE* ]]; then PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS$KDE_DESKTOP_ENV + elif [[ $DESKTOP = *XFCE* ]]; then + PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS$XFCE_DESKTOP_ENV + elif [[ $DESKTOP = *CINNAMON* ]]; then + PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS$CINNAMON_DESKTOP_ENV else PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS$GNOME_DESKTOP_ENV fi