Add compatibility with stand-alone home-manager

gmodena · Nov 12, 2023 · 2b53cf7 · 2b53cf7
1 parent df3ea99
commit 2b53cf7
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
@@ -1,13 +1,20 @@
-{ config, lib, pkgs, osConfig, ... }:
+{ config, lib, pkgs, ... }@args:
 let
   cfg = config.services.flatpak;
   installation = "user";
 in
 {
 
-  options.services.flatpak = import ./options.nix { inherit cfg lib pkgs; };
+  options.services.flatpak = (import ./options.nix { inherit cfg lib pkgs; })
+  // {
+    enable = with lib; mkOption {
+      type = types.bool;
+      default = args.osConfig.services.flatpak.enable or false;
+      description = mkDoc "Whether to enable nix-flatpak declarative flatpak management in home-manager.";
+    };
+  };
 
-  config = lib.mkIf osConfig.services.flatpak.enable {
+  config = lib.mkIf (config.services.flatpak.enable) {
     systemd.user.services."flatpak-managed-install" = {
       Unit = {
         After = [