diff --git a/flake.nix b/flake.nix index 484dd569..9e2a657a 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,6 @@ ./deployment/flake-part.nix ./infra/flake-part.nix - ./keys/flake-part.nix ./services/flake-part.nix ]; diff --git a/infra/common/procolixResource.nix b/infra/common/procolixResource.nix index bfb00040..e08edfc2 100644 --- a/infra/common/procolixResource.nix +++ b/infra/common/procolixResource.nix @@ -1,7 +1,5 @@ { - self, inputs, - providers, lib, config, ... @@ -12,6 +10,10 @@ let inherit (lib.attrsets) concatMapAttrs optionalAttrs; inherit (lib.strings) removeSuffix; + secretsPrefix = ../../secrets; + secrets = import (secretsPrefix + "/secrets.nix"); + keys = import ../../keys; + in { options = { @@ -30,12 +32,10 @@ in config = let - hostPublicKey = self.keys.systems.${config.procolixVm.name}; + hostPublicKey = keys.systems.${config.procolixVm.name}; in { - type = providers.local.exec; - ssh = { host = config.procolixVm.host; hostPublicKey = hostPublicKey; @@ -55,13 +55,13 @@ in age.secrets = concatMapAttrs ( name: secret: optionalAttrs (elem hostPublicKey secret.publicKeys) ({ - ${removeSuffix ".age" name}.file = ../../secrets + "/${name}"; + ${removeSuffix ".age" name}.file = secretsPrefix + "/${name}"; }) - ) (import ../../secrets/secrets.nix); + ) secrets; ## FIXME: Remove direct root authentication once the NixOps4 NixOS ## provider supports users with password-less sudo. - users.users.root.openssh.authorizedKeys.keys = attrValues self.keys.contributors; + users.users.root.openssh.authorizedKeys.keys = attrValues keys.contributors; }; }; } diff --git a/infra/flake-part.nix b/infra/flake-part.nix index 3cf421fe..e059bfc3 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -1,5 +1,4 @@ { - self, inputs, lib, ... @@ -13,7 +12,8 @@ let vmName: { providers, ... }: { - _module.args = { inherit self inputs providers; }; + _module.args = { inherit inputs; }; + type = providers.local.exec; imports = [ inputs.nixops4-nixos.modules.nixops4Resource.nixos ./common/procolixResource.nix diff --git a/keys/flake-part.nix b/keys/flake-part.nix deleted file mode 100644 index 7e01c8fd..00000000 --- a/keys/flake-part.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - flake.keys = import ./.; -}