forked from c3d2/nix-config
flake.nix: eliminate flakifiedHosts
This commit is contained in:
parent
8ed7dba181
commit
292042b7d2
10
flake.nix
10
flake.nix
|
@ -58,8 +58,6 @@
|
||||||
extraHostRegistry.hosts = import ./host-registry.nix;
|
extraHostRegistry.hosts = import ./host-registry.nix;
|
||||||
hostRegistry = lib.recursiveUpdate zwHostRegistry extraHostRegistry;
|
hostRegistry = lib.recursiveUpdate zwHostRegistry extraHostRegistry;
|
||||||
|
|
||||||
flakifiedHosts = nixpkgs.lib.filterAttrs (name: _: self.nixosConfigurations ? "${name}") hostRegistry.hosts;
|
|
||||||
|
|
||||||
getHostAddr = name:
|
getHostAddr = name:
|
||||||
let
|
let
|
||||||
hostConf = hostRegistry.hosts."${name}";
|
hostConf = hostRegistry.hosts."${name}";
|
||||||
|
@ -112,7 +110,7 @@
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
echo -n -e "$NORMAL"
|
echo -n -e "$NORMAL"
|
||||||
'') (builtins.attrNames flakifiedHosts)}
|
'') (builtins.attrNames self.nixosConfigurations)}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
prebuild-all = pkgs.runCommandNoCC "prebuild-all" {
|
prebuild-all = pkgs.runCommandNoCC "prebuild-all" {
|
||||||
|
@ -122,7 +120,7 @@
|
||||||
|
|
||||||
${pkgs.lib.concatMapStrings (name: ''
|
${pkgs.lib.concatMapStrings (name: ''
|
||||||
ln -s ${self.nixosConfigurations."${name}".config.system.build.toplevel} name
|
ln -s ${self.nixosConfigurations."${name}".config.system.build.toplevel} name
|
||||||
'') (builtins.attrNames flakifiedHosts)}
|
'') (builtins.attrNames self.nixosConfigurations)}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
prebuild-all-remote = pkgs.writeScriptBin "prebuild-all" ''
|
prebuild-all-remote = pkgs.writeScriptBin "prebuild-all" ''
|
||||||
|
@ -135,7 +133,7 @@
|
||||||
ssh $1 -- nix build -vL --no-link ${
|
ssh $1 -- nix build -vL --no-link ${
|
||||||
pkgs.lib.concatMapStringsSep " " (name:
|
pkgs.lib.concatMapStringsSep " " (name:
|
||||||
"${self}#nixosConfigurations.${name}.config.system.build.toplevel"
|
"${self}#nixosConfigurations.${name}.config.system.build.toplevel"
|
||||||
) (builtins.attrNames flakifiedHosts)
|
) (builtins.attrNames self.nixosConfigurations)
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -179,7 +177,7 @@
|
||||||
#!${pkgs.runtimeShell} -ex
|
#!${pkgs.runtimeShell} -ex
|
||||||
ssh ${target} "time nix-collect-garbage -d && time nix-store --optimise"
|
ssh ${target} "time nix-collect-garbage -d && time nix-store --optimise"
|
||||||
'';
|
'';
|
||||||
}) {} (builtins.attrNames flakifiedHosts) //
|
}) {} (builtins.attrNames self.nixosConfigurations) //
|
||||||
|
|
||||||
builtins.foldl' (result: host:
|
builtins.foldl' (result: host:
|
||||||
let
|
let
|
||||||
|
|
Loading…
Reference in New Issue
Block a user