difftreelog
fix documentation generator fix
in: trunk
3 files changed
modules/nixos/secrets.nixdiffbeforeafterboth--- a/modules/nixos/secrets.nix
+++ b/modules/nixos/secrets.nix
@@ -7,7 +7,7 @@
}: let
inherit (builtins) hashString;
inherit (lib.stringsWithDeps) stringAfter;
- inherit (lib.options) mkOption;
+ inherit (lib.options) mkOption literalExpression;
inherit (lib.lists) optional;
inherit (lib.attrsets) mapAttrs;
inherit (lib.modules) mkIf;
@@ -78,6 +78,7 @@
type = str;
description = "Group of the secret";
default = sysConfig.users.users.${config.owner}.group;
+ defaultText = literalExpression "config.users.users.$${owner}.group";
};
};
});
modules/nixpkgs.nixdiffbeforeafterboth1{2 lib,3 fleetLib,4 config,5 ...6}: let7 inherit (lib.options) mkOption;8 inherit (lib.types) path;9 inherit (lib.modules) mkRemovedOptionModule;10 inherit (fleetLib.options) mkHostsOption;11 inherit (fleetLib.types) listOfOverlay;1213 _file = ./nixpkgs.lib;14in {15 options = {16 nixpkgs = {17 buildUsing = mkOption {18 description = ''19 Default nixpkgs to use for building the systems.20 '';21 type = path;22 };23 overlays = mkOption {24 description = ''25 Package overlays to apply for all the hosts, gets propagated into26 `hosts.*.nixosModules.nixpkgs.overlays`.27 '';28 type = listOfOverlay;29 };30 };31 hosts = mkHostsOption {32 inherit _file;33 options.nixpkgs.buildUsing = mkOption {34 description = ''35 Nixpkgs to use for building the system.3637 Note that this option is defined at the host level, not the nixosModules level,38 nixosModules will be evaluated using this flake input.39 '';40 type = path;41 default = config.nixpkgs.buildUsing;42 };43 # imports = [44 # (mkRemovedOptionModule ["nixpkgs" "overlays"] "this option needs to be specified at nixosModules level")45 # ];46 config.nixos = {47 inherit _file;48 nixpkgs.overlays = config.nixpkgs.overlays;49 imports = [50 (mkRemovedOptionModule ["nixpkgs" "buildUsing"] "this option should be specified at the host level, not the nixosModules level")51 ];52 };53 };54 };55}modules/secrets.nixdiffbeforeafterboth--- a/modules/secrets.nix
+++ b/modules/secrets.nix
@@ -3,7 +3,7 @@
config,
...
}: let
- inherit (lib.options) mkOption;
+ inherit (lib.options) mkOption literalExpression;
inherit (lib.types) unspecified nullOr listOf str bool attrsOf submodule;
inherit (lib.strings) concatStringsSep;
inherit (lib.attrsets) mapAttrs;
@@ -30,6 +30,7 @@
};
regenerateOnOwnerRemoved = mkOption {
default = config.regenerateOnOwnerAdded;
+ defaultText = literalExpression "regenerateOnOwnerAdded";
type = bool;
description = ''
Should this secret be removed on owner removal, or it may be just reencrypted