From adc5f652de8d443da07c1316e364f3f9e557ea79 Mon Sep 17 00:00:00 2001 From: Florian RICHER Date: Tue, 28 May 2024 16:05:44 +0200 Subject: [PATCH] Apply from official conf --- flake.nix | 6 +++++- modules/home/apps/flatpak/default.nix | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 82e6270..8eb11a3 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ nixpkgs, home-manager, agenix, + nix-flatpak, ... }: let @@ -44,7 +45,10 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = inputs; - home-manager.users.florian = import ./hosts/${s.name}/home.nix; + home-manager.users.florian.imports = [ + nix-flatpak.homeManagerModules.nix-flatpak + ./hosts/${s.name}/home.nix + ]; } ]; }; diff --git a/modules/home/apps/flatpak/default.nix b/modules/home/apps/flatpak/default.nix index aa779f1..052f6b0 100644 --- a/modules/home/apps/flatpak/default.nix +++ b/modules/home/apps/flatpak/default.nix @@ -1,12 +1,10 @@ -{ config, pkgs, lib, nix-flatpak, ... }: +{ config, lib, ... }: with lib; let cfg = config.modules.home.apps.flatpak; in { - imports = [ nix-flatpak.homeManagerModules.nix-flatpak ]; - options.modules.home.apps.flatpak = { enable = mkEnableOption '' Enable flatpak with my custom configurations