Skip to content

Commit

Permalink
Add some missing literalExpression
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperSandro2000 authored and mergify[bot] committed Oct 22, 2024
1 parent c504fd7 commit 26642e8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions modules/home-manager/sops.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ let
sopsFile = lib.mkOption {
type = lib.types.path;
default = cfg.defaultSopsFile;
defaultText = "\${config.sops.defaultSopsFile}";
defaultText = lib.literalExpression "\${config.sops.defaultSopsFile}";
description = ''
Sops file the secret is loaded from.
'';
Expand Down Expand Up @@ -267,7 +267,7 @@ in {
};

# [re]load secrets on home-manager activation
home.activation = let
home.activation = let
darwin = let
domain-target = "gui/$(id -u ${config.home.username})";
in ''
Expand All @@ -286,7 +286,7 @@ in {
unset systemdStatus
'';

in {
sops-nix = if pkgs.stdenv.isLinux then linux else darwin;
};
Expand Down
2 changes: 1 addition & 1 deletion modules/sops/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ let
};
sopsFile = lib.mkOption {
type = lib.types.path;
defaultText = "\${config.sops.defaultSopsFile}";
defaultText = lib.literalExpression "\${config.sops.defaultSopsFile}";
description = ''
Sops file the secret is loaded from.
'';
Expand Down
4 changes: 2 additions & 2 deletions modules/sops/templates/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ in {
group = mkOption {
type = singleLineStr;
default = users.${config.owner}.group;
defaultText = ''config.users.users.''${cfg.owner}.group'';
defaultText = lib.literalExpression ''config.users.users.''${cfg.owner}.group'';
description = ''
Group of the file.
'';
};
file = mkOption {
type = types.path;
default = pkgs.writeText config.name config.content;
defaultText = ''pkgs.writeText config.name config.content'';
defaultText = lib.literalExpression ''pkgs.writeText config.name config.content'';
example = "./configuration-template.conf";
description = ''
File used as the template. When this value is specified, `sops.templates.<name>.content` is ignored.
Expand Down

0 comments on commit 26642e8

Please sign in to comment.