From 1cfc810e699659bab9a9c8f071a5770fc3d8b886 Mon Sep 17 00:00:00 2001 From: Grey Jones Date: Wed, 2 Sep 2026 04:23:40 +0100 Subject: [PATCH] mkStandardFeatureFlakeModule -> mkStandardFeature --- flake.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index ecabc9a..810e171 100644 --- a/flake.nix +++ b/flake.nix @@ -51,18 +51,18 @@ flake.homeModules.${moduleName} = func; }; - mkStandardFeatureFlakeModule = moduleName: { optionName, optionDefinition, systemConfig, homeConfig }: { - imports = [ (mkMirroredModulesFlakeModule "${moduleName}Options" ({ lib, ... }: { + mkStandardFeature = { + flakeModule = moduleName: optionName: optionDefinition: (mkMirroredModulesFlakeModule "${moduleName}Options" ({ lib, ... }: { options = setAttrByStrPath optionName optionDefinition; - })) ]; + })); - flake.nixosModules.${moduleName} = { lib, config, ... }: { + nixosModule = { config, optionName }: systemConfig: { config = lib.mkIf (attrByStrPath optionName config) (mkIfElse (config.features.nixos.home-manager.enable) { home-manager.users.${config.info.userName}.${optionName} = lib.mkDefault true; } systemConfig); }; - flake.homeModules.${moduleName} = { lib, config, ... }: { + homeModule = { config, optionName }: homeConfig: { config = lib.mkIf (attrByStrPath optionName config) homeConfig; }; };