From dc6229aaace3d81f44f82a28440837cb9c79a806 Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Thu, 30 Apr 2026 13:51:05 +0200
Subject: [PATCH] refactor(flatpak): simplify flatpak module

---
 system/packages/flatpak.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/system/packages/flatpak.nix b/system/packages/flatpak.nix
index b510141..0d59a64 100644
--- a/system/packages/flatpak.nix
+++ b/system/packages/flatpak.nix
@@ -11,12 +11,8 @@ in {
     enable = mkEnableOption "Enable Flatpak support";
     builder.enable = mkEnableOption "Enable Flatpak builder";
   };
-  config = {
-    services.flatpak = mkIf cfg.enable {
-      inherit (cfg) enable;
-    };
-    environment.systemPackages = mkIf cfg.builder.enable [
-      pkgs.flatpak-buildR
-    ];
+  config = mkIf cfg.enable {
+    environment.systemPackages = lists.optional cfg.builder.enable pkgs.flatpak-builder;
+    services.flatpak.enable = true;
   };
 }