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

7}: let7}: let
8  inherit (builtins) hashString;8  inherit (builtins) hashString;
9  inherit (lib.stringsWithDeps) stringAfter;9  inherit (lib.stringsWithDeps) stringAfter;
10  inherit (lib.options) mkOption;10  inherit (lib.options) mkOption literalExpression;
11  inherit (lib.lists) optional;11  inherit (lib.lists) optional;
12  inherit (lib.attrsets) mapAttrs;12  inherit (lib.attrsets) mapAttrs;
13  inherit (lib.modules) mkIf;13  inherit (lib.modules) mkIf;
78        type = str;78        type = str;
79        description = "Group of the secret";79        description = "Group of the secret";
80        default = sysConfig.users.users.${config.owner}.group;80        default = sysConfig.users.users.${config.owner}.group;
81        defaultText = literalExpression "config.users.users.$${owner}.group";
81      };82      };
82    };83    };
83  });84  });

--- a/modules/nixpkgs.nix
+++ b/modules/nixpkgs.nix
@@ -4,7 +4,7 @@
   config,
   ...
 }: let
-  inherit (lib.options) mkOption;
+  inherit (lib.options) mkOption literalExpression;
   inherit (lib.types) path;
   inherit (lib.modules) mkRemovedOptionModule;
   inherit (fleetLib.options) mkHostsOption;
@@ -39,6 +39,7 @@
         '';
         type = path;
         default = config.nixpkgs.buildUsing;
+        defaultText = literalExpression "config.nixpkgs.buildUsing";
       };
       # imports = [
       # 	(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