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

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

3  config,3  config,
4  ...4  ...
5}: let5}: let
6  inherit (lib.options) mkOption;6  inherit (lib.options) mkOption literalExpression;
7  inherit (lib.types) unspecified nullOr listOf str bool attrsOf submodule;7  inherit (lib.types) unspecified nullOr listOf str bool attrsOf submodule;
8  inherit (lib.strings) concatStringsSep;8  inherit (lib.strings) concatStringsSep;
9  inherit (lib.attrsets) mapAttrs;9  inherit (lib.attrsets) mapAttrs;
30      };30      };
31      regenerateOnOwnerRemoved = mkOption {31      regenerateOnOwnerRemoved = mkOption {
32        default = config.regenerateOnOwnerAdded;32        default = config.regenerateOnOwnerAdded;
33        defaultText = literalExpression "regenerateOnOwnerAdded";
33        type = bool;34        type = bool;
34        description = ''35        description = ''
35          Should this secret be removed on owner removal, or it may be just reencrypted36          Should this secret be removed on owner removal, or it may be just reencrypted