deploy: use system from host configuration

This commit is contained in:
Benjamin Yule Bädorf 2024-05-22 22:51:30 +02:00 committed by teutat3s
parent af233793fb
commit 3bcdd33b5a
Signed by untrusted user: teutat3s
GPG key ID: 4FA1D3FA524F22C1

View file

@ -7,21 +7,6 @@
{ lib, inputs }: { lib, inputs }:
let let
# https://github.com/serokell/deploy-rs#overall-usage
system = "aarch64-linux";
pkgs = import inputs.nixpkgs { inherit system; };
deployPkgs = import inputs.nixpkgs {
inherit system;
overlays = [
inputs.deploy-rs.overlay
(self: super: {
deploy-rs = {
inherit (pkgs) deploy-rs;
lib = super.deploy-rs.lib;
};
})
];
};
getFqdn = getFqdn =
c: c:
let let
@ -66,7 +51,21 @@ in
*/ */
lib.recursiveUpdate (lib.mapAttrs (_: c: { lib.recursiveUpdate (lib.mapAttrs (_: c: {
hostname = getFqdn c; hostname = getFqdn c;
profiles.system = { profiles.system = let
system = c.pkgs.system;
# Unmodified nixpkgs
pkgs = import inputs.nixpkgs { inherit system; };
# nixpkgs with deploy-rs overlay but force the nixpkgs package
deployPkgs = import inputs.nixpkgs {
inherit system;
overlays = [
inputs.deploy-rs.overlay # or deploy-rs.overlays.default
(self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; })
];
};
in {
user = "root"; user = "root";
path = deployPkgs.deploy-rs.lib.activate.nixos c; path = deployPkgs.deploy-rs.lib.activate.nixos c;
}; };