From 362001c0b30e0f9d636349246b3a765f7a98f0d6 Mon Sep 17 00:00:00 2001 From: Shinjitsu Ni Ikiru Date: Mon, 10 Jul 2023 13:17:51 -0600 Subject: [PATCH] fix --- debian.sh | 64 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/debian.sh b/debian.sh index 8b64dff..0c22aa6 100755 --- a/debian.sh +++ b/debian.sh @@ -19,8 +19,8 @@ ######################## PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin export DEBIAN_FRONTEND=noninteractive -TARGET='/install' -mkdir $TARGET +ARGET='/install' +kdir $TARGET ###################################### echo HARD_DISK=$2 @@ -31,18 +31,18 @@ ROOT_PASSWORD="123456" WIRELESS_PASSWORD='123456' SSID='wifi' WIRELESS_INTERFACE='wlan0' -DISK_PASSWORD='123456' -COMPRESSION='compress=zlib:5' +DISK_PASSWORD='REM&rap234' +COMPRESSION='compress=none' AUTO_DECRYPT='True' FLATPAKS+=(io.exodus.Exodus com.nextcloud.desktopclient.nextcloud com.tutanota.Tutanota) #Packages BASE_PACKAGES=" linux-image-amd64 grub-efi efibootmgr plymouth plymouth-themes 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 " -SHARED_DESKTOP_APPS=" handbrake calligra yt-dlp plasma-discover-backend-flatpak kwin-addons kde-standard konsole dolphin kde-spectacle print-manager " -#TROUBLESOME_PACKAGES - packages here that may not be available for your Debian release -#TROUBLESOME_PACKAGES=" " +#DESKTOP_ENV=" calligra print-manager plasma-discover-backend-flatpak kwin-addons kde-standard konsole dolphin kde-spectacle " +DESKTOP_ENV=" gnome gnome-tweaks gnome-software-plugin-flatpak gimp " +SHARED_DESKTOP_APPS=" handbrake yt-dlp " VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf cockpit-machines" -PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS +PACKAGES=$BASE_PACKAGES$SHARED_DESKTOP_APPS$DESKTOP_ENV TAR_EXCLUDES="--exclude=/.snapshots --exclude=/snapshots --exclude=/var/backups --exclude=/volumes/* --exclude=/mnt/* --exclude=/var/tmp/* --exclude=/tmp/* --exclude=/raid/* --exclude=/root/* --exclude=/var/cache/apt/archives/* --exclude=/proc/* --exclude=/.snapshots/* --exclude=/var/lib/libvirt/* --exclude=/dev/* --exclude=/sys/* --exclude=/home/* --exclude=/var/lib/postgresql --exclude=/var/lib/containers" installVPN() { @@ -62,11 +62,17 @@ partitionDetection() { partitionDetection auto_login() { - mkdir -p $TARGET/etc/sddm.conf.d - echo "[Autologin]" >$TARGET/etc/sddm.conf.d/autologin - echo "User=$USER" >>$TARGET/etc/sddm.conf.d/autologin - echo "Session=plasma.desktop" >>$TARGET/etc/sddm.conf.d/autologin - echo "Relogin=false" >>$TARGET/etc/sddm.conf.d/autologin + + if [[ $DESKTOP_ENV == *"plasma"* ]]; then + mkdir -p $TARGET/etc/sddm.conf.d + echo "[Autologin]" >$TARGET/etc/sddm.conf.d/autologin + echo "User=$USER" >>$TARGET/etc/sddm.conf.d/autologin + echo "Session=plasma.desktop" >>$TARGET/etc/sddm.conf.d/autologin + echo "Relogin=false" >>$TARGET/etc/sddm.conf.d/autologin + else + sed -i '/daemon/a AutomaticLoginEnable=True' $TARGET/etc/gdm3/daemon.conf + sed -i "/daemon/a AutomaticLogin = $USER" $TARGET/etc/gdm3/daemon.conf + fi } create-os-snapshots() { @@ -154,11 +160,11 @@ os-restore() { } systemMounts() { - mount -o rbind /dev $TARGET/dev - mount -o rbind /dev/pts $TARGET/dev/pts - mount -o rbind /proc $TARGET/proc - mount -o rbind /sys $TARGET/sys - mount -t efivarfs none $TARGET/sys/firmware/efi/efivars + mount -o rbind /dev $TARGET/dev + mount -o rbind /dev/pts $TARGET/dev/pts + mount -o rbind /proc $TARGET/proc + mount -o rbind /sys $TARGET/sys + mount -t efivarfs none $TARGET/sys/firmware/efi/efivars } decryptBoot() { @@ -253,7 +259,7 @@ install() { } desktop() { - SERVICES+=(mullvad-daemon pmcd pmie pmlogger pmproxy exim4 cockpit.socket apparmor nfs-server smbd rpbind rpcbind.socket avahi-daemon bluetooth) + SERVICES+=(mullvad-daemon pmcd pmie pmlogger pmproxy exim4 cockpit.socket apparmor nfs-server smbd rpbind rpcbind.socket avahi-daemon bluetooth) for i in "${SERVICES[@]}"; do systemctl disable --now $i done @@ -282,7 +288,9 @@ remove-snapshots() { } flatpaks() { - echo;echo "Installing Flatpaks......";echo + echo + echo "Installing Flatpaks......" + echo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo for i in "${FLATPAKS[@]}"; do echo $i @@ -328,7 +336,7 @@ function setup_script() { #sed -i 's/most/dep/i' $TARGET/etc/initramfs-tools/initramfs.conf echo "bash /usr/bin/debian.sh bootloader $1 $ROOT_NAME $ROOT_MAPPER_NAME" >>$TARGET/setup.sh echo 'bash /usr/bin/debian.sh grub-snapshots' >>$TARGET/setup.sh - echo 'bash /usr/bin/debian.sh accounts' >>$TARGET/setup.sh + echo 'bash /usr/bin/debian.sh accounts' >>$TARGET/setup.sh echo 'bash /usr/bin/debian.sh desktop' >>$TARGET/setup.sh echo 'bash /usr/bin/debian.sh btrfs-tweaks' >>$TARGET/setup.sh @@ -352,7 +360,7 @@ btrfs_filesytem() { mount -o $COMPRESSION,subvol=@$ROOT_NAME /dev/mapper/$ROOT_MAPPER_NAME $TARGET } -installCodium(){ +installCodium() { curl -fSsL https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg | gpg --dearmor | tee /usr/share/keyrings/vscodium.gpg >/dev/null echo "deb [arch=amd64 signed-by=/usr/share/keyrings/vscodium.gpg] https://download.vscodium.com/debs vscodium main" | tee /etc/apt/sources.list.d/vscodium.list apt update @@ -361,10 +369,16 @@ installCodium(){ 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 - echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg] https://brave-browser-apt-release.s3.brave.com/ stable main" | tee /etc/apt/sources.list.d/brave-browser-release.list + #curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg + #echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg] https://brave-browser-apt-release.s3.brave.com/ stable main" | tee /etc/apt/sources.list.d/brave-browser-release.list + #apt update + #apt install brave-browser -y + + #Vivaldi + curl -fsSL https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor | tee /usr/share/keyrings/vivaldi.gpg > /dev/null + echo deb [arch=amd64,armhf signed-by=/usr/share/keyrings/vivaldi.gpg] https://repo.vivaldi.com/archive/deb/ stable main | sudo tee /etc/apt/sources.list.d/vivaldi.list apt update - apt install brave-browser -y + apt install -y vivaldi-stable } installElement() {