Enable system flatpak via nix-flatpak and simplify HM

templates/home-flake.nix

@@ -7,12 +7,19 @@
         url = "github:nix-community/home-manager";
         inputs.nixpkgs.follows = "nixpkgs";
         };
-    };
-
-    outputs = { nixpkgs, home-manager, ... }: {
-        homeConfigurations."admin" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        modules = [ ./home.nix ];
+        nix-flatpak = {
+        url = "github:gmodena/nix-flatpak/?ref=latest";
+        inputs.nixpkgs.follows = "nixpkgs";
         };
     };
-}
+
+    outputs = { nixpkgs, home-manager, nix-flatpak, ... }: {
+        homeConfigurations."admin" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        modules = [
+            nix-flatpak.homeManagerModules.nix-flatpak
+            ./home.nix
+        ];
+        };
+    };
+}

templates/home-home.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   home.username = "admin";
@@ -7,6 +12,17 @@
 
   nixpkgs.config.allowUnfree = true;
 
+  # User-level flatpaks
+  services.flatpak = {
+    enable = true;
+    packages = [ ];
+    update = {
+      auto.enable = true;
+      auto.onCalendar = "weekly";
+      onActivation = false;
+    };
+  };
+
   programs = {
     distrobox = {
       enable = true;
@@ -49,27 +65,27 @@
   home.packages = with pkgs; [
 
     # decibels            # default GNOME audio player
-    gnome-calendar      # default GNOME calendar
+    gnome-calendar # default GNOME calendar
     # gnome-contacts      # default GNOME contacts
 
-    firefox             # Mozilla web browser
+    firefox # Mozilla web browser
     # google-chrome       # web browser from Google
     # chromium            # open source web browser from Google
     # brave               # privacy oriented web browser
     # opera               # fast alternative web browser
     # vivaldi             # powerful and personal web browser
 
-    thunderbird         # full-featured Mozilla e-mail client
+    thunderbird # full-featured Mozilla e-mail client
     # geary               # default GNOME email client
 
-    ptyxis              # container aware GNOME terminal
+    ptyxis # container aware GNOME terminal
     # alacritty           # GPU accelerated terminal emulator
     # kitty               # GPU accelerated terminal emulator
 
-    jetbrains-toolbox   # fresh versions of Android Studio and other tools
+    jetbrains-toolbox # fresh versions of Android Studio and other tools
     # devpod              # open-source code spaces
 
-    pods                # Podman desktop application
+    pods # Podman desktop application
 
   ];
 
@@ -99,6 +115,9 @@
     DEFAULT_TERMINAL = "${pkgs.ghostty}/bin/ghostty";
     EDITOR = "${pkgs.micro}/bin/micro";
     DBX_CONTAINER_HOME_PREFIX = "$HOME/distrobox";
+    XDG_DATA_DIRS =
+      "${config.home.profileDirectory}/share:${config.xdg.dataHome}/applications:"
+      + "${config.xdg.dataHome}/flatpak/exports/share:/var/lib/flatpak/exports/share:/usr/local/share:/usr/share";
   };
 
 }