diff options
Diffstat (limited to 'modules/private/system/eldiron.nix')
-rw-r--r-- | modules/private/system/eldiron.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/private/system/eldiron.nix b/modules/private/system/eldiron.nix index bbe1345..0490cfc 100644 --- a/modules/private/system/eldiron.nix +++ b/modules/private/system/eldiron.nix | |||
@@ -3,17 +3,16 @@ | |||
3 | { | 3 | { |
4 | boot.kernelPackages = pkgs.linuxPackages_latest; | 4 | boot.kernelPackages = pkgs.linuxPackages_latest; |
5 | myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; }; | 5 | myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; }; |
6 | hostEnv.FQDN = "eldiron.immae.eu"; | ||
7 | 6 | ||
8 | networking = { | 7 | networking = { |
9 | firewall.enable = true; | 8 | firewall.enable = true; |
10 | # 176.9.151.89 declared in nixops -> infra / tools | 9 | # 176.9.151.89 declared in nixops -> infra / tools |
11 | interfaces."eth0".ipv4.addresses = pkgs.lib.attrsets.mapAttrsToList | 10 | interfaces."eth0".ipv4.addresses = pkgs.lib.attrsets.mapAttrsToList |
12 | (n: ips: { address = ips.ip4; prefixLength = 32; }) | 11 | (n: ips: { address = ips.ip4; prefixLength = 32; }) |
13 | (pkgs.lib.attrsets.filterAttrs (n: v: n != "main") config.myEnv.servers.eldiron.ips); | 12 | (pkgs.lib.attrsets.filterAttrs (n: v: n != "main") config.hostEnv.ips); |
14 | interfaces."eth0".ipv6.addresses = pkgs.lib.flatten (pkgs.lib.attrsets.mapAttrsToList | 13 | interfaces."eth0".ipv6.addresses = pkgs.lib.flatten (pkgs.lib.attrsets.mapAttrsToList |
15 | (n: ips: map (ip: { address = ip; prefixLength = (if n == "main" && ip == pkgs.lib.head ips.ip6 then 64 else 128); }) (ips.ip6 or [])) | 14 | (n: ips: map (ip: { address = ip; prefixLength = (if n == "main" && ip == pkgs.lib.head ips.ip6 then 64 else 128); }) (ips.ip6 or [])) |
16 | config.myEnv.servers.eldiron.ips); | 15 | config.hostEnv.ips); |
17 | }; | 16 | }; |
18 | 17 | ||
19 | imports = builtins.attrValues (import ../..); | 18 | imports = builtins.attrValues (import ../..); |
@@ -44,7 +43,7 @@ | |||
44 | hetzner = { | 43 | hetzner = { |
45 | robotUser = config.myEnv.hetzner.user; | 44 | robotUser = config.myEnv.hetzner.user; |
46 | robotPass = config.myEnv.hetzner.pass; | 45 | robotPass = config.myEnv.hetzner.pass; |
47 | mainIPv4 = config.myEnv.servers.eldiron.ips.main.ip4; | 46 | mainIPv4 = config.hostEnv.ips.main.ip4; |
48 | partitions = '' | 47 | partitions = '' |
49 | clearpart --all --initlabel --drives=sda,sdb | 48 | clearpart --all --initlabel --drives=sda,sdb |
50 | 49 | ||