From 5b838c0d9c3659658b730e6d2ae04d8915dc66e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 1 Apr 2024 12:58:05 +0200 Subject: [PATCH 1/2] sops: fix decrypte path on machine --- nixosModules/clanCore/facts/secret/sops.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixosModules/clanCore/facts/secret/sops.nix b/nixosModules/clanCore/facts/secret/sops.nix index 58ffc3f73..fcd4fec5c 100644 --- a/nixosModules/clanCore/facts/secret/sops.nix +++ b/nixosModules/clanCore/facts/secret/sops.nix @@ -46,6 +46,7 @@ in clanCore.facts.secretModule = "clan_cli.facts.secret_modules.sops"; clanCore.facts.secretUploadDirectory = lib.mkDefault "/var/lib/sops-nix"; sops.secrets = builtins.mapAttrs (name: _: { + name = lib.strings.removePrefix "${config.networking.hostName}-" name; sopsFile = config.clanCore.clanDir + "/sops/secrets/${name}/secret"; format = "binary"; }) secrets; From 8b4dbc60b572abe69e93c3646facb3ece957c693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 2 Apr 2024 13:26:57 +0200 Subject: [PATCH 2/2] clan/install: drop -t flag from nixos-anywhere --- pkgs/clan-cli/clan_cli/machines/install.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/machines/install.py b/pkgs/clan-cli/clan_cli/machines/install.py index 7ee60ff1e..78a7d1fbf 100644 --- a/pkgs/clan-cli/clan_cli/machines/install.py +++ b/pkgs/clan-cli/clan_cli/machines/install.py @@ -40,7 +40,6 @@ def install_nixos( "nixos-anywhere", "-f", f"{machine.flake}#{machine.name}", - "-t", "--no-reboot", "--extra-files", str(tmpdir),