git.delta.rocks / jrsonnet / refs/commits / 353fd26e74ae

--- 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";
       };
     };
   });

4  config,4  config,
5  ...5  ...
6}: let6}: let
7  inherit (lib.options) mkOption;7  inherit (lib.options) mkOption literalExpression;
8  inherit (lib.types) path;8  inherit (lib.types) path;
9  inherit (lib.modules) mkRemovedOptionModule;9  inherit (lib.modules) mkRemovedOptionModule;
10  inherit (fleetLib.options) mkHostsOption;10  inherit (fleetLib.options) mkHostsOption;
39        '';39        '';
40        type = path;40        type = path;
41        default = config.nixpkgs.buildUsing;41        default = config.nixpkgs.buildUsing;
42        defaultText = literalExpression "config.nixpkgs.buildUsing";
42      };43      };
43      # imports = [44      # imports = [
44      # 	(mkRemovedOptionModule ["nixpkgs" "overlays"] "this option needs to be specified at nixosModules level")45      # 	(mkRemovedOptionModule ["nixpkgs" "overlays"] "this option needs to be specified at nixosModules level")

--- 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