move deployment config

This commit is contained in:
Katherina Walshe-Grey 2024-09-19 23:06:08 +01:00
parent bbb3bd3c16
commit 8cbfb51930
2 changed files with 24 additions and 21 deletions

View file

@ -11,6 +11,7 @@ in
time.timeZone = "Etc/UTC"; time.timeZone = "Etc/UTC";
# Allow remote deployment with colmena # Allow remote deployment with colmena
deployment.targetUser = null;
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
nix.settings.trusted-users = [ "@wheel" ]; nix.settings.trusted-users = [ "@wheel" ];
}; };

View file

@ -64,33 +64,35 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
defaults.imports = [ defaults = { config, lib, pkgs, ... }: {
home-manager.nixosModules.home-manager # disable remote deployment by default
nur.nixosModules.nur # (can stil build locally with nixos-rebuild)
{ nixpkgs.overlays = [ nur.overlay ]; } deployment.targetHost = lib.mkDefault null;
agenix.nixosModules.default
birdsong.nixosModules.default # TODO: set up some remote builders
./common # until this is done, as we have multiple architectures, safer to build on target
./services deployment.buildOnTarget = true;
];
imports = [
home-manager.nixosModules.home-manager
nur.nixosModules.nur
{ nixpkgs.overlays = [ nur.overlay ]; }
agenix.nixosModules.default
birdsong.nixosModules.default
./common
./services
];
};
yevaud.deployment.targetHost = "yevaud.birdsong.network";
orm.deployment.targetHost = "orm.birdsong.network";
kalessin.deployment.targetHost = "kalessin.birdsong.network";
kilgharrah.imports = [ ./hosts/kilgharrah ]; kilgharrah.imports = [ ./hosts/kilgharrah ];
tohru.imports = [ ./hosts/tohru ]; tohru.imports = [ ./hosts/tohru ];
yevaud.imports = [ ./hosts/yevaud ]; yevaud.imports = [ ./hosts/yevaud ];
orm.imports = [ ./hosts/orm ]; orm.imports = [ ./hosts/orm ];
kalessin.imports = [ ./hosts/kalessin ]; kalessin.imports = [ ./hosts/kalessin ];
defaults.deployment = {
allowLocalDeployment = true;
buildOnTarget = true;
targetUser = null;
};
kilgharrah.deployment.targetHost = null;
tohru.deployment.targetHost = null;
yevaud.deployment.targetHost = "yevaud.birdsong.network";
orm.deployment.targetHost = "orm.birdsong.network";
kalessin.deployment.targetHost = "kalessin.birdsong.network";
}; };
# TODO: have this work on other systems too # TODO: have this work on other systems too