From 2f5a7dd068be6d4f6e7cc296b6f717959cdc9cce Mon Sep 17 00:00:00 2001 From: kat Date: Tue, 26 Jul 2022 17:36:38 +0000 Subject: [PATCH] fix: allow linux and darwin machines to build --- devShell.nix | 2 +- meta.nix | 2 +- modules/meta/network.nix | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/devShell.nix b/devShell.nix index 4d6d6510..fcf9a72e 100644 --- a/devShell.nix +++ b/devShell.nix @@ -46,7 +46,7 @@ pkgs.mkShell { nf-update sumireko-apply ] ++ config.runners.lazy.nativeBuildInputs - ++ lib.optional (builtins.getEnv "TRUSTED" != "") (pkgs.writeShellScriptBin "bitw" ''${pkgs.rbw-bitw}/bin/bitw -p gpg://${config.network.nodes.${pkgs.hostPlatform.parsed.kernel.name}.${builtins.getEnv "HOME_HOSTNAME"}.kw.secrets.repo.bitw.source} "$@"'') + ++ lib.optional (builtins.getEnv "TRUSTED" != "") (pkgs.writeShellScriptBin "bitw" ''${pkgs.rbw-bitw}/bin/bitw -p gpg://${config.network.nodes.all.${builtins.getEnv "HOME_HOSTNAME"}.kw.secrets.repo.bitw.source} "$@"'') ++ (map (node: writeShellScriptBin "${node.networking.hostName}-sd-img" '' nix build -f . network.nodes.${node.networking.hostName}.system.build.sdImage --show-trace diff --git a/meta.nix b/meta.nix index abaaa1d0..f4a50db3 100644 --- a/meta.nix +++ b/meta.nix @@ -8,7 +8,7 @@ kw.secrets.command = let - bitw = pkgs.writeShellScriptBin "bitw" ''${pkgs.rbw-bitw}/bin/bitw -p gpg://${config.network.nodes.${pkgs.hostPlatform.parsed.kernel.name}.${builtins.getEnv "HOME_HOSTNAME"}.kw.secrets.repo.bitw.source} "$@"''; + bitw = pkgs.writeShellScriptBin "bitw" ''${pkgs.rbw-bitw}/bin/bitw -p gpg://${config.network.nodes.all.${builtins.getEnv "HOME_HOSTNAME"}.kw.secrets.repo.bitw.source} "$@"''; in "${bitw}/bin/bitw get"; diff --git a/modules/meta/network.nix b/modules/meta/network.nix index 83ddbabb..9c26f389 100644 --- a/modules/meta/network.nix +++ b/modules/meta/network.nix @@ -39,6 +39,10 @@ with lib; default = toString (inputs.darwin + "/modules"); }; }; + nodes.all = mkOption { + type = types.attrsOf types.unspecified; + default = config.network.nodes.nixos // config.network.nodes.darwin; + }; nodes.nixos = let nixosModule = { name, config, meta, modulesPath, lib, ... }: with lib; {