From 54478b72745ae7795766c3551586df49b57a9383 Mon Sep 17 00:00:00 2001
From: ska <ska@noreply.git.skarockoi.de>
Date: Thu, 25 Dec 2025 23:45:34 +0000
Subject: [PATCH] Update flatpak-management.nix

---
 flatpak-management.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/flatpak-management.nix b/flatpak-management.nix
index 633cd13..41def20 100644
--- a/flatpak-management.nix
+++ b/flatpak-management.nix
@@ -1,9 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  desiredFlatpaks = [
-    "ch.threema.threema-web-desktop"
-  ];
+  desiredFlatpaks = [];
 
   flatpakScript = pkgs.writeScript "nix-flatpak-management" ''
     #!${pkgs.runtimeShell} -e
@@ -16,13 +14,13 @@ let
     installedFlatpaks=$(${pkgs.flatpak}/bin/flatpak list --app --columns=application)
 
     # Users can decide what flatpaks they want to install so this is disabled
-    # Remove Flatpaks not in the desired list
-    # for installed in $installedFlatpaks; do
-    #   if ! echo ${lib.concatStringsSep " " desiredFlatpaks} | grep -q "$installed"; then
-    #     echo "Removing $installed because it's not in the desiredFlatpaks list."
-    #     ${pkgs.flatpak}/bin/flatpak uninstall -y --noninteractive "$installed"
-    #   fi
-    # done
+    Remove Flatpaks not in the desired list
+    for installed in $installedFlatpaks; do
+      if ! echo ${lib.concatStringsSep " " desiredFlatpaks} | grep -q "$installed"; then
+        echo "Removing $installed because it's not in the desiredFlatpaks list."
+        ${pkgs.flatpak}/bin/flatpak uninstall -y --noninteractive "$installed"
+      fi
+    done
 
     # Install or re-install desired Flatpaks
     for app in ${lib.concatStringsSep " " desiredFlatpaks}; do
@@ -30,6 +28,9 @@ let
       ${pkgs.flatpak}/bin/flatpak install -y --noninteractive flathub "$app"
     done
 
+    # Hardcoded Threema install because the beta is not on Flathub yet
+    ${pkgs.flatpak}/bin/flatpak install -y --from https://releases.threema.ch/flatpak/threema-desktop/ch.threema.threema-desktop.flatpakref --noninteractive flathub "$app"
+
     # Remove unused Flatpaks
     ${pkgs.flatpak}/bin/flatpak uninstall --unused -y --noninteractive