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

refactor nix config a bit

Browse source
This commit is contained in:
Vivian 2022-12-26 15:13:04 +01:00
parent f91842b292
commit 9bf32cc9b3
9 changed files with 182 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

159
nixos/hosts/olympus/default.nix
View file

@ -1,56 +1,48 @@
[
{
hostname = "edgerouter";
{
"edgerouter" = {
ip = "10.42.42.1";
ip6 = "2001:41f0:9639:1:b6fb:e4ff:fe53:9c0";
mac = "B4:FB:E4:53:9C:0A";
nix = false;
}
{
hostname = "unifi-ap";
};
"unifi-ap" = {
ip = "10.42.42.2";
mac = "b4:fb:e4:f3:ff:1b";
nix = false;
}
{
hostname = "dhcp";
};
"dhcp" = {
ip = "10.42.42.3";
mac = "3E:2D:E8:AA:E2:81";
tags = [ "networking" ];
}
{
hostname = "bastion";
};
"bastion" = {
ip = "10.42.42.4";
ip6 = "2001:41f0:9639:1:80f0:7cff:fecb:bd6d";
mac = "82:F0:7C:CB:BD:6D";
type = "vm";
}
{
hostname = "vault";
};
"vault" = {
ip = "10.42.42.6";
mac = "16:2B:87:55:0C:0C";
profile = "vault-0";
tags = [ "vault" ];
}
{
hostname = "mosquitto";
};
"mosquitto" = {
ip = "10.42.42.7";
mac = "C6:F9:8B:3D:9E:37";
}
{
hostname = "home-assistant";
};
"home-assistant" = {
ip = "10.42.42.8";
ip6 = "2001:41f0:9639:1:bfe7:3fd9:75de:cbee";
mac = "9E:60:78:ED:81:B4";
nix = false;
}
{
hostname = "nginx";
};
"nginx" = {
ip = "10.42.42.9";
ip6 = "2001:41f0:9639:1:68c2:89ff:fe85:cfa6";
mac = "6A:C2:89:85:CF:A6";
tags = [ "web" ];
}
};
# {
# hostname = "k3s-node1";
# profile = "k3s";
@ -58,133 +50,110 @@
# mac = "2E:F8:55:23:D9:9B";
# type = "vm";
# }
{
hostname = "WoolooTV";
"WoolooTV" = {
ip = "10.42.42.13";
mac = "74:40:be:48:85:a4";
nix = false;
}
{
hostname = "outline";
};
"outline" = {
mac = "52:13:EB:FD:87:F0";
ip = "10.42.42.14";
}
{
hostname = "dns-1";
};
"dns-1" = {
profile = "dns";
ip = "10.42.42.15";
mac = "5E:F6:36:23:16:E3";
tags = [ "dns" "networking" ];
}
{
hostname = "dns-2";
};
"dns-2" = {
profile = "dns";
ip = "10.42.42.16";
mac = "B6:04:0B:CD:0F:9F";
tags = [ "dns" "networking" ];
}
{
hostname = "minio";
};
"minio" = {
ip = "10.42.42.17";
mac = "0A:06:5E:E7:9A:0C";
}
{
hostname = "mailserver";
};
"mailserver" = {
ip = "10.42.42.18";
mac = "AA:F2:3D:5E:B3:40";
}
{
hostname = "victoriametrics";
};
"victoriametrics" = {
ip = "10.42.42.19";
mac = "9E:91:61:35:84:1F";
}
{
hostname = "unifi";
};
"unifi" = {
ip = "10.42.42.20";
mac = "1A:88:A0:B0:65:B4";
}
{
hostname = "minecraft";
};
"minecraft" = {
ip = "10.42.42.21";
mac = "EA:30:73:E4:B6:69";
nix = false;
}
{
hostname = "gitea";
};
"gitea" = {
ip = "10.42.42.22";
mac = "DE:5F:B0:83:6F:34";
}
{
hostname = "hedgedoc";
};
"hedgedoc" = {
ip = "10.42.42.23";
mac = "86:BC:0C:18:BC:9B";
}
{
hostname = "zmeura";
};
"zmeura" = {
ip = "10.42.42.24";
mac = "b8:27:eb:d5:e0:f5";
nix = false;
}
{
hostname = "wireguard";
};
"wireguard" = {
ip = "10.42.42.25";
mac = "1E:ED:97:2C:C3:9D";
}
{
hostname = "database";
};
"database" = {
ip = "10.42.42.26";
mac = "CE:6E:96:87:18:1B";
}
{
hostname = "bookwyrm";
};
"bookwyrm" = {
ip = "10.42.42.27";
mac = "9E:8A:6C:39:27:DE";
nix = false;
}
{
hostname = "synapse";
};
"synapse" = {
ip = "10.42.42.28";
mac = "9E:86:D3:46:EE:AE";
}
{
hostname = "keycloak";
};
"keycloak" = {
ip = "10.42.42.29";
mac = "A6:09:1D:A8:81:28";
}
{
hostname = "vault-1";
};
"vault-1" = {
ip = "10.42.42.30";
mac = "26:69:0E:7C:B3:79";
profile = "vault-1";
tags = [ "vault" ];
}
{
hostname = "vaultwarden";
};
"vaultwarden" = {
ip = "10.42.42.31";
mac = "96:61:03:16:63:98";
}
{
hostname = "ntfy";
};
"ntfy" = {
ip = "10.42.42.32";
mac = "7A:17:9E:80:72:01";
}
{
hostname = "woodpecker";
};
"woodpecker" = {
ip = "10.42.42.33";
mac = "1E:24:DA:DB:4A:1A";
}
{
hostname = "nuc";
};
"nuc" = {
ip = "10.42.42.42";
ip6 = "2001:41f0:9639:1::42";
mac = "1C:69:7A:62:30:88";
nix = false;
}
{
hostname = "eevee";
};
"eevee" = {
ip = "10.42.42.69";
ip6 = "2001:41f0:9639:1:a83:e416:dc99:5ed3";
mac = "34:97:f6:93:9A:AA";
nix = false;
}
]
};
}

5
nixos/hosts/olympus/dhcp/configuration.nix
View file

@ -1,13 +1,16 @@
{ config, pkgs, hosts, ... }:
let
inherit (builtins) filter hasAttr;
inherit (pkgs.lib.attrsets) mapAttrsToList;
hostToDhcp = { hostname, mac, ip, ... }: {
ethernetAddress = mac;
hostName = hostname;
ipAddress = ip;
};
localDomain = config.networking.domain;
hosts' = filter (h: hasAttr "ip" h && hasAttr "mac" h) hosts.${localDomain};
# TODO: Alternatively filter on flat_hosts where realm == localDomain
local_hosts = mapAttrsToList (name: value: value // { hostname = name; }) hosts.${localDomain};
hosts' = filter (h: hasAttr "ip" h && hasAttr "mac" h) local_hosts;
in {
imports = [ ];