gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: allow linux and darwin machines to build

Browse source
This commit is contained in:
Kat Inskip 2022-07-26 17:36:38 +00:00
parent d33717e3dc
commit 2f5a7dd068
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devShell.nix
View file

@ -46,7 +46,7 @@ pkgs.mkShell {
nf-update nf-update
sumireko-apply sumireko-apply
] ++ config.runners.lazy.nativeBuildInputs ] ++ 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 ++ (map
(node: writeShellScriptBin "${node.networking.hostName}-sd-img" '' (node: writeShellScriptBin "${node.networking.hostName}-sd-img" ''
nix build -f . network.nodes.${node.networking.hostName}.system.build.sdImage --show-trace nix build -f . network.nodes.${node.networking.hostName}.system.build.sdImage --show-trace

2
meta.nix
View file

@ -8,7 +8,7 @@
kw.secrets.command = kw.secrets.command =
let 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 in
"${bitw}/bin/bitw get"; "${bitw}/bin/bitw get";

4
modules/meta/network.nix
View file

@ -39,6 +39,10 @@ with lib;
default = toString (inputs.darwin + "/modules"); default = toString (inputs.darwin + "/modules");
}; };
}; };
nodes.all = mkOption {
type = types.attrsOf types.unspecified;
default = config.network.nodes.nixos // config.network.nodes.darwin;
};
nodes.nixos = nodes.nixos =
let let
nixosModule = { name, config, meta, modulesPath, lib, ... }: with lib; { nixosModule = { name, config, meta, modulesPath, lib, ... }: with lib; {