From 77fc9d98532300736c6149323ef12745441bf4f5 Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene@technicalissues.us>
Date: Sun, 22 Mar 2026 20:53:08 -0400
Subject: [PATCH] Manage flatpaks in home-manager

Using this on Ubuntu 25.10. Also sorted module list.
---
 lib/mkHomeConfig.nix                           | 4 +++-
 modules/hosts/nixos/bigboy/default.nix         | 2 +-
 modules/hosts/nixos/rainbow-planet/default.nix | 2 +-
 modules/shared/{nixos => linux}/flatpaks.nix   | 8 +++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)
 rename modules/shared/{nixos => linux}/flatpaks.nix (61%)

diff --git a/lib/mkHomeConfig.nix b/lib/mkHomeConfig.nix
index 0e61a2d..f71a7b7 100644
--- a/lib/mkHomeConfig.nix
+++ b/lib/mkHomeConfig.nix
@@ -22,9 +22,10 @@
       # the path to your home.nix.
       modules = [
         ./nixpkgs-settings.nix
-        ../modules/shared/home/general
         ../modules/hosts/home-manager-only
         ../modules/hosts/home-manager-only/home-${username}.nix
+        ../modules/shared/home/general
+        ../modules/shared/linux/flatpaks.nix
 
         {
           home = {
@@ -33,6 +34,7 @@
           };
         }
 
+        inputs.nix-flatpak.homeManagerModules.nix-flatpak
         inputs.sops-nix.homeManagerModules.sops
       ];
     };
diff --git a/modules/hosts/nixos/bigboy/default.nix b/modules/hosts/nixos/bigboy/default.nix
index 1c3c050..685e89f 100644
--- a/modules/hosts/nixos/bigboy/default.nix
+++ b/modules/hosts/nixos/bigboy/default.nix
@@ -16,7 +16,7 @@ in
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../../shared/nixos/flatpaks.nix
+    ../../../shared/linux/flatpaks.nix
     ../../../shared/nixos/ripping.nix
   ];
 
diff --git a/modules/hosts/nixos/rainbow-planet/default.nix b/modules/hosts/nixos/rainbow-planet/default.nix
index acb84bc..142389b 100644
--- a/modules/hosts/nixos/rainbow-planet/default.nix
+++ b/modules/hosts/nixos/rainbow-planet/default.nix
@@ -8,7 +8,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../../shared/nixos/flatpaks.nix
+    ../../../shared/linux/flatpaks.nix
     ../../../shared/nixos/ripping.nix
   ];
 
diff --git a/modules/shared/nixos/flatpaks.nix b/modules/shared/linux/flatpaks.nix
similarity index 61%
rename from modules/shared/nixos/flatpaks.nix
rename to modules/shared/linux/flatpaks.nix
index 418b231..6d68d30 100644
--- a/modules/shared/nixos/flatpaks.nix
+++ b/modules/shared/linux/flatpaks.nix
@@ -1,15 +1,21 @@
 {
+  # Though it wouldn't seem to be this way,
+  # This is used both in NixOS and Home Manager
   services = {
     flatpak = {
       enable = true;
       packages = [
-        "im.riot.Riot"
         "com.cassidyjames.butler"
         "com.logseq.Logseq"
         "com.vivaldi.Vivaldi"
+        "im.riot.Riot"
+        "io.kopia.KopiaUI"
+        "org.localsend.localsend_app"
+        "org.gnome.Fractal"
         "org.signal.Signal"
         "org.telegram.desktop"
       ];
+      uninstallUnmanaged = true;
       update.auto = {
         enable = true;
         onCalendar = "daily";