v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

cleanup

Browse source
This commit is contained in:
Vivian 2023-04-29 15:25:11 +02:00
parent 079e73ed9e
commit d24fc4cbc6
4 changed files with 5 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/util.nix
View file

@ -2,6 +2,7 @@
let
inherit (builtins) filter attrValues concatMap mapAttrs;
inherit (nixpkgs.lib.attrsets) mapAttrsToList;
inherit (nixpkgs.lib) nixosSystem;
base_imports = [
home-manager.nixosModules.home-manager
mailserver.nixosModules.mailserver
@ -44,7 +45,7 @@ in {
mkColmenaHost = { ip ? null, hostname, tags, realm, type ? "lxc", ... }@host:
let
# this makes local apply work a bit nicer
name = if realm == "thalassa" then hostname else "${hostname}.${realm}";
name = if type == "local" then hostname else "${hostname}.${realm}";
in {
"${name}" = {
imports = resolve_imports host;