diff --git a/flake.lock b/flake.lock index 00a0a9c5..9d6b8e4a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729357638, + "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", "type": "github" }, "original": { diff --git a/modules/home-manager/sops.nix b/modules/home-manager/sops.nix index 3520bb9a..a111af16 100644 --- a/modules/home-manager/sops.nix +++ b/modules/home-manager/sops.nix @@ -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. ''; @@ -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 '' @@ -286,7 +286,7 @@ in { unset systemdStatus ''; - + in { sops-nix = if pkgs.stdenv.isLinux then linux else darwin; }; diff --git a/modules/sops/default.nix b/modules/sops/default.nix index 73d5d8ea..b348070a 100644 --- a/modules/sops/default.nix +++ b/modules/sops/default.nix @@ -103,7 +103,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. ''; diff --git a/modules/sops/templates/default.nix b/modules/sops/templates/default.nix index 892ad9b8..6f2bca76 100644 --- a/modules/sops/templates/default.nix +++ b/modules/sops/templates/default.nix @@ -69,7 +69,7 @@ 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. ''; @@ -77,7 +77,7 @@ in { 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..content` is ignored.