From e148dc2c6871ee1b0bd248d14e48bd78a91d4772 Mon Sep 17 00:00:00 2001 From: musjj <72612857+musjj@users.noreply.github.com> Date: Thu, 18 Sep 2025 17:36:08 +0700 Subject: [PATCH] remove sops.age.sshKeyPaths deprecation --- modules/home-manager/sops.nix | 13 ------------- modules/nix-darwin/default.nix | 13 ------------- modules/sops/default.nix | 13 ------------- 3 files changed, 39 deletions(-) diff --git a/modules/home-manager/sops.nix b/modules/home-manager/sops.nix index 892eeb6..d792c4c 100644 --- a/modules/home-manager/sops.nix +++ b/modules/home-manager/sops.nix @@ -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 diff --git a/modules/nix-darwin/default.nix b/modules/nix-darwin/default.nix index 15fc918..3c975b2 100644 --- a/modules/nix-darwin/default.nix +++ b/modules/nix-darwin/default.nix @@ -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" ); diff --git a/modules/sops/default.nix b/modules/sops/default.nix index 6f38838..67c166f 100644 --- a/modules/sops/default.nix +++ b/modules/sops/default.nix @@ -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; } ];