mirror of
https://github.com/Mic92/sops-nix.git
synced 2025-12-26 14:14:58 +08:00
remove sops.age.sshKeyPaths deprecation
This commit is contained in:
parent
4fb1eef0c0
commit
e148dc2c68
3 changed files with 0 additions and 39 deletions
|
|
@ -337,19 +337,6 @@ in
|
|||
}
|
||||
];
|
||||
|
||||
warnings = [
|
||||
(lib.mkIf
|
||||
(
|
||||
cfg.age.sshKeyPaths != [ ]
|
||||
&& cfg.gnupg.sshKeyPaths == [ ]
|
||||
&& cfg.gnupg.home == null
|
||||
&& cfg.age.keyFile == null
|
||||
&& cfg.age.sshKeyFile == null
|
||||
)
|
||||
"The option sops.age.sshKeyPaths has been deprecated, since age now has native SSH support. Use option sops.age.sshKeyFile instead."
|
||||
)
|
||||
];
|
||||
|
||||
home.sessionVariables = lib.mkIf cfg.gnupg.qubes-split-gpg.enable {
|
||||
# TODO: Add this package to nixpkgs and use it from the store
|
||||
# https://github.com/QubesOS/qubes-app-linux-split-gpg
|
||||
|
|
|
|||
|
|
@ -396,19 +396,6 @@ in
|
|||
})
|
||||
|
||||
{
|
||||
warnings = [
|
||||
(lib.mkIf
|
||||
(
|
||||
cfg.age.sshKeyPaths != [ ]
|
||||
&& cfg.gnupg.sshKeyPaths == [ ]
|
||||
&& cfg.gnupg.home == null
|
||||
&& cfg.age.keyFile == null
|
||||
&& cfg.age.sshKeyFile == null
|
||||
)
|
||||
"The option sops.age.sshKeyPaths has been deprecated, since age now has native SSH support. Use option sops.age.sshKeyFile instead."
|
||||
)
|
||||
];
|
||||
|
||||
sops.environment.SOPS_GPG_EXEC = lib.mkIf (cfg.gnupg.home != null || cfg.gnupg.sshKeyPaths != [ ]) (
|
||||
lib.mkDefault "${pkgs.gnupg}/bin/gpg"
|
||||
);
|
||||
|
|
|
|||
|
|
@ -496,19 +496,6 @@ in
|
|||
};
|
||||
})
|
||||
{
|
||||
warnings = [
|
||||
(lib.mkIf
|
||||
(
|
||||
cfg.age.sshKeyPaths != [ ]
|
||||
&& cfg.gnupg.sshKeyPaths == [ ]
|
||||
&& cfg.gnupg.home == null
|
||||
&& cfg.age.keyFile == null
|
||||
&& cfg.age.sshKeyFile == null
|
||||
)
|
||||
"The option sops.age.sshKeyPaths has been deprecated, since age now has native SSH support. Use option sops.age.sshKeyFile instead."
|
||||
)
|
||||
];
|
||||
|
||||
system.build.sops-nix-manifest = manifest;
|
||||
}
|
||||
];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue