From 19fd59584c86c78440ece0c9bfc2f9d6b12d862d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 14 Dec 2022 19:54:02 -0700
Subject: [PATCH] fix

---
 debian.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian.sh b/debian.sh
index 551f64d..d8fdc2c 100755
--- a/debian.sh
+++ b/debian.sh
@@ -44,11 +44,11 @@ WIRELESS_INTERFACE='wlan0'
 DISK_PASSWORD='123456'
 COMPRESSION='compress=zlib:5'
 DEBIAN_RELEASE='testing'
-FLATPAKS+=( app/net.brinkervii.grapejuice app/com.vscodium.codium app/im.riot.Riot org.kde.kdenlive )
+FLATPAKS+=( app/net.brinkervii.grapejuice org.kde.kdenlive )
 
 #Packages
 SHARED_DESKTOP_APPS=" gnome-core gimp gnome-tweaks gajim evolution nextcloud-desktop telegram-desktop gnome-photos handbrake mpv libreoffice "
-PACKAGES=" zram-tools samba samba-common nfs-common nfs-kernel-server linux-cpupower locales syncthing redis cockpit cockpit-machines cockpit-podman flatpak powertop blueman cups acpi packagekit cockpit-packagekit cockpit-pcp cockpit-storaged acpid podman pulseaudio ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager efibootmgr linux-headers-amd64 cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat postgresql redis neofetch fuse3 build-essential unzip bash-completion parted dosfstools wget curl "
+PACKAGES="  apt-transport-https zram-tools samba samba-common nfs-common nfs-kernel-server linux-cpupower locales syncthing redis cockpit cockpit-machines cockpit-podman flatpak powertop blueman cups acpi packagekit cockpit-packagekit cockpit-pcp cockpit-storaged acpid podman pulseaudio ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager efibootmgr linux-headers-amd64 cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat postgresql redis neofetch fuse3 build-essential unzip bash-completion parted dosfstools wget curl "
 #REMOVED=" yt-dlp aardvark-dns podman-compose systemd-zram-generator podman-toolbox "
 VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf "
 PACKAGES=$PACKAGES$SHARED_DESKTOP_APPS$VIRTUALIZATION
@@ -140,6 +140,14 @@ systemMounts(){
     mount -t efivarfs none $TARGET/sys/firmware/efi/efivars
 }
 
+additional-software(){
+    wget -O /usr/share/keyrings/element-io-archive-keyring.gpg https://packages.element.io/debian/element-io-archive-keyring.gpg
+    echo "deb [signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] https://packages.element.io/debian/ default main" | tee /etc/apt/sources.list.d/element-io.list
+    wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg | gpg --dearmor | dd of=/usr/share/keyrings/vscodium-archive-keyring.gpg
+    echo 'deb [ signed-by=/usr/share/keyrings/vscodium-archive-keyring.gpg ] https://download.vscodium.com/debs vscodium main' | tee /etc/apt/sources.list.d/vscodium.list
+    apt update;apt install -y -o Dpkg::Options::="--force-unsafe-io" element-desktop codium
+}
+
 install() {
     partitions
     sed -i '/^SigLevel/s/^\(.*\)$/#\1\n/' /etc/pacman.conf
@@ -231,6 +239,7 @@ bootloader() {
     echo "bash /usr/bin/debian.sh bootloader $1" >>$TARGET/setup.sh
     echo 'bash /usr/bin/debian.sh grub-snapshots' >>$TARGET/setup.sh
     echo 'bash /usr/bin/debian.sh desktop' >>$TARGET/setup.sh
+    echo 'bash /usr/bin/debian.sh additional-software' >>$TARGET/setup.sh
     echo 'bash /usr/bin/debian.sh btrfs-tweaks' >>$TARGET/setup.sh
    
     chmod +x $TARGET/usr/bin/debian.sh
@@ -417,6 +426,8 @@ elif [ "$1" = "kernel-packages" ]; then
     kernel-packages
 elif [ "$1" = "upgrade-system" ]; then
     upgrade-system
+elif [ "$1" = "additional-software" ]; then
+    additional-software
 elif [ "$1" = "chroot" ]; then
     enter_chroot
 elif [ "$1" = "initialize" ]; then