From 4afce9cdb1c78cb4090acc4b5747bb3a3174e3a5 Mon Sep 17 00:00:00 2001
From: DragonSlayer_14 <dragonslayer14@murena.io>
Date: Sun, 6 Sep 2026 12:58:30 +0200
Subject: [PATCH] Feat: Fehlende APT-Pakete wiederhergestellt und
 Gitea-Paketquellen eingerichtet

Co-authored-by: Junie <junie@jetbrains.com>
---
 config/packages/01-base.list    | 11 +++++++++++
 config/packages/02-desktop.list |  5 +++++
 stages/01-apt-unstable.sh       | 16 ++++++++++++----
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/config/packages/01-base.list b/config/packages/01-base.list
index 864dd60..de2494f 100644
--- a/config/packages/01-base.list
+++ b/config/packages/01-base.list
@@ -9,6 +9,8 @@ apparmor-notify
 apparmor-profiles
 apparmor-profiles-extra
 apparmor-utils
+apt-listbugs
+apt-listchanges
 aptitude
 baobab
 bat
@@ -16,11 +18,15 @@ bleachbit
 bluetooth
 blueman
 bluez
+bruno
 btop
 ca-certificates
 clamav
 clamav-daemon
+clamav-docs
+clamav-freshclam
 command-not-found
+cpupower-gui
 cryptomator
 curl
 dconf-editor
@@ -48,14 +54,19 @@ keepassxc
 lsd
 man
 network-manager-gnome
+plymouth
+plymouth-themes
+resources
 rfkill
 ripgrep
 rpi-imager
 shellcheck
+sl
 systemd-timesyncd
 tar
 tealdeer
 timeshift
+topgrade
 tree
 unrar
 unzip
diff --git a/config/packages/02-desktop.list b/config/packages/02-desktop.list
index 29268ef..1f12412 100644
--- a/config/packages/02-desktop.list
+++ b/config/packages/02-desktop.list
@@ -3,8 +3,11 @@
 # ==============================================================================
 
 cava
+codium
 dconf-editor
 flameshot
+floorp
+fragments
 gnome-calculator
 gnome-decoder
 gnome-font-viewer
@@ -22,12 +25,14 @@ nwg-look
 obfuscate
 pipewire
 pipewire-pulse
+remmina
 sddm
 slurp
 speech-dispatcher
 swappy
 swaybg
 thunar
+vesktop
 wayland-utils
 wireplumber
 wl-clipboard
diff --git a/stages/01-apt-unstable.sh b/stages/01-apt-unstable.sh
index 894ada4..3f9096d 100755
--- a/stages/01-apt-unstable.sh
+++ b/stages/01-apt-unstable.sh
@@ -30,8 +30,11 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
 log_substep "Enabling 32-bit (i386) multiarch architecture..."
 apt_enable_i386
 
-# 3. Ensure Keyrings directory exists
+# 3. Ensure Keyrings directory exists and install repository keyrings
 apt_ensure_keyrings_dir
+log_substep "Installing custom repository keyrings..."
+apt_add_keyring_from_url "https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/debian/repository.key" "gitea-Linuxapps.asc" || log_warn "Could not fetch gitea-Linuxapps.asc keyring."
+apt_add_keyring_from_url "https://gitea.creative-dragonslayer.de/api/packages/Mirror/debian/repository.key" "gitea-Mirror.asc" || log_warn "Could not fetch gitea-Mirror.asc keyring."
 
 # 4. Migrate /etc/apt/sources.list to Deb822 format
 log_substep "Migrating APT sources to Deb822 format..."
@@ -41,9 +44,14 @@ if [[ -f /etc/apt/sources.list && ! -f /etc/apt/sources.list.bak_pre_unstable ]]
     sed -i 's/^[[:space:]]*deb/# deb/' /etc/apt/sources.list
 fi
 
-# Deploy debian-unstable.sources
-if [[ -f "$SCRIPT_DIR/data/apt/sources.list.d/debian-unstable.sources" ]]; then
-    apt_install_sources_file "$SCRIPT_DIR/data/apt/sources.list.d/debian-unstable.sources" "debian-unstable.sources"
+# Deploy Deb822 sources
+log_substep "Deploying Deb822 APT sources..."
+if compgen -G "$SCRIPT_DIR/data/apt/sources.list.d/*.sources" > /dev/null; then
+    for src_file in "$SCRIPT_DIR"/data/apt/sources.list.d/*.sources; do
+        if [[ "$(basename "$src_file")" != "xanmod.sources" ]]; then
+            apt_install_sources_file "$src_file" "$(basename "$src_file")"
+        fi
+    done
 fi
 
 # 5. Deploy APT Preferences / Pinning