git.delta.rocks / jrsonnet / refs/commits / 98314cfacdde

73	#[serde(default = "generate_gc_prefix")]73	#[serde(default = "generate_gc_prefix")]
74	pub gc_root_prefix: String,74	pub gc_root_prefix: String,
7575
76	#[serde(default)]76	#[serde(default, skip_serializing_if = "Vec::is_empty")]
77	pub manager_keys: Vec<ManagerKey>,77	pub manager_keys: Vec<ManagerKey>,
7878
79	#[serde(default)]79	#[serde(default)]
149#[must_use]149#[must_use]
150pub struct FleetSecretDistribution {150pub struct FleetSecretDistribution {
151	#[serde(default)]151	#[serde(default)]
152	#[serde(skip_serializing_if = "Option::is_none")]
153	pub managed: Option<bool>,152	pub owners: BTreeSet<String>,
154	#[serde(default)]153	#[serde(flatten)]
155	pub owners: BTreeSet<String>,154	pub secret: FleetSecretData,
155
156	#[serde(flatten)]156	#[serde(default, skip_serializing, alias="managed")]
157	pub secret: FleetSecretData,157	pub _deprecated_managed: bool,
158}158}
159159
160#[derive(Clone)]160#[derive(Clone)]
244		} = self;244		} = self;
245		let idx = distributions.0.len();245		let idx = distributions.0.len();
246		distributions.0.push(FleetSecretDistribution {246		distributions.0.push(FleetSecretDistribution {
247			managed: None,
248			owners: BTreeSet::from_iter([owner.clone()]),247			owners: BTreeSet::from_iter([owner.clone()]),
249			secret,248			secret,
249
250			_deprecated_managed: true,
250		});251		});
251		OccupiedDistEntry {252		OccupiedDistEntry {
252			distributions,253			distributions,

--- a/lib/flakePart.nix
+++ b/lib/flakePart.nix
@@ -8,34 +8,21 @@
   ...
 }:
 let
-  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.options) mkOption;
   inherit (lib.attrsets) mapAttrs;
   inherit (lib.types)
     lazyAttrsOf
     deferredModule
     unspecified
-    str
     ;
   inherit (lib.strings) isPath;
-  inherit (lib.modules) mkIf mkOptionDefault;
+  inherit (lib.modules) mkOptionDefault;
 in
 {
   options.fleetModules = mkOption {
     type = lazyAttrsOf unspecified;
     default = { };
   };
-  options.fleetNixosConfigurationsCompat = {
-    enable = mkEnableOption "Create nixosConfiguration output based on fleetConfiguration";
-    configuration = mkOption {
-      type = str;
-      description = "Which fleetConfiguration to use for compatibility";
-      default = "default";
-    };
-    data = mkOption {
-      type = unspecified;
-      description = "Imported fleet.nix file for fleet";
-    };
-  };
   options.fleetConfigurations = mkOption {
     type = lazyAttrsOf deferredModule;
     apply =
@@ -103,14 +90,6 @@
   config = {
     _module.args.fleetLib = import ../lib { inherit lib; };
     flake.fleetConfigurations = config.fleetConfigurations;
-    flake.nixosConfigurations =
-      let
-        cfg = config.fleetNixosConfigurationsCompat;
-      in
-      mkIf cfg.enable (
-        mapAttrs (name: host: host.nixos)
-          (config.fleetConfigurations.${cfg.configuration} cfg.data).config.hosts
-      );
     flake.fleetModules = config.fleetModules;
   };