diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2024-02-24 12:05:51 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2024-02-24 12:30:51 +0100 |
commit | 5141a78699924106c8f3d7359528176b1c3fdf7a (patch) | |
tree | a4c6147100321caa287f19068957c3321a97c5aa | |
parent | 5707d6961bbd68c2ab51eaaa790435546f714037 (diff) | |
download | Nix-5141a78699924106c8f3d7359528176b1c3fdf7a.tar.gz Nix-5141a78699924106c8f3d7359528176b1c3fdf7a.tar.zst Nix-5141a78699924106c8f3d7359528176b1c3fdf7a.zip |
Add ipv6 configuration for zoldene
-rw-r--r-- | deploy/flake.lock | 4 | ||||
-rw-r--r-- | flake.lock | 4 | ||||
-rw-r--r-- | flakes/flake.lock | 2 | ||||
-rw-r--r-- | systems/zoldene/base.nix | 13 |
4 files changed, 18 insertions, 5 deletions
diff --git a/deploy/flake.lock b/deploy/flake.lock index 1b64653..d4fc017 100644 --- a/deploy/flake.lock +++ b/deploy/flake.lock | |||
@@ -2783,7 +2783,7 @@ | |||
2783 | }, | 2783 | }, |
2784 | "locked": { | 2784 | "locked": { |
2785 | "lastModified": 1, | 2785 | "lastModified": 1, |
2786 | "narHash": "sha256-eMtBwFev8mR4UddJmG/pTlS2Xh4/LTckEpdiz3a2cOk=", | 2786 | "narHash": "sha256-RMKq47gsekcw+bpRXj4Es8p3bBCNg4tmDqcg8PAbovs=", |
2787 | "path": "../flakes", | 2787 | "path": "../flakes", |
2788 | "type": "path" | 2788 | "type": "path" |
2789 | }, | 2789 | }, |
@@ -3974,7 +3974,7 @@ | |||
3974 | }, | 3974 | }, |
3975 | "locked": { | 3975 | "locked": { |
3976 | "lastModified": 1, | 3976 | "lastModified": 1, |
3977 | "narHash": "sha256-NjuGFIxBJ3hIxk2fnZeQOvWa+jDHbGsIRpKT5I+cRz4=", | 3977 | "narHash": "sha256-ozjB87SNwkQLQH2nkkIQJqC3HoewYe1z1PoyiNGmtcM=", |
3978 | "path": "../systems/zoldene", | 3978 | "path": "../systems/zoldene", |
3979 | "type": "path" | 3979 | "type": "path" |
3980 | }, | 3980 | }, |
@@ -2664,7 +2664,7 @@ | |||
2664 | }, | 2664 | }, |
2665 | "locked": { | 2665 | "locked": { |
2666 | "lastModified": 1, | 2666 | "lastModified": 1, |
2667 | "narHash": "sha256-eMtBwFev8mR4UddJmG/pTlS2Xh4/LTckEpdiz3a2cOk=", | 2667 | "narHash": "sha256-RMKq47gsekcw+bpRXj4Es8p3bBCNg4tmDqcg8PAbovs=", |
2668 | "path": "./flakes", | 2668 | "path": "./flakes", |
2669 | "type": "path" | 2669 | "type": "path" |
2670 | }, | 2670 | }, |
@@ -3990,7 +3990,7 @@ | |||
3990 | }, | 3990 | }, |
3991 | "locked": { | 3991 | "locked": { |
3992 | "lastModified": 1, | 3992 | "lastModified": 1, |
3993 | "narHash": "sha256-NjuGFIxBJ3hIxk2fnZeQOvWa+jDHbGsIRpKT5I+cRz4=", | 3993 | "narHash": "sha256-ozjB87SNwkQLQH2nkkIQJqC3HoewYe1z1PoyiNGmtcM=", |
3994 | "path": "../systems/zoldene", | 3994 | "path": "../systems/zoldene", |
3995 | "type": "path" | 3995 | "type": "path" |
3996 | }, | 3996 | }, |
diff --git a/flakes/flake.lock b/flakes/flake.lock index 359762a..d6e655e 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock | |||
@@ -3895,7 +3895,7 @@ | |||
3895 | }, | 3895 | }, |
3896 | "locked": { | 3896 | "locked": { |
3897 | "lastModified": 1, | 3897 | "lastModified": 1, |
3898 | "narHash": "sha256-NjuGFIxBJ3hIxk2fnZeQOvWa+jDHbGsIRpKT5I+cRz4=", | 3898 | "narHash": "sha256-ozjB87SNwkQLQH2nkkIQJqC3HoewYe1z1PoyiNGmtcM=", |
3899 | "path": "../systems/zoldene", | 3899 | "path": "../systems/zoldene", |
3900 | "type": "path" | 3900 | "type": "path" |
3901 | }, | 3901 | }, |
diff --git a/systems/zoldene/base.nix b/systems/zoldene/base.nix index 2751d63..fc0d68a 100644 --- a/systems/zoldene/base.nix +++ b/systems/zoldene/base.nix | |||
@@ -84,6 +84,19 @@ in | |||
84 | firewall.allowedUDPPorts = [ 43484 ]; | 84 | firewall.allowedUDPPorts = [ 43484 ]; |
85 | # needed for initrd proper network setup too | 85 | # needed for initrd proper network setup too |
86 | useDHCP = lib.mkDefault true; | 86 | useDHCP = lib.mkDefault true; |
87 | interfaces."enp0s31f6".ipv6.addresses = pkgs.lib.flatten (pkgs.lib.attrsets.mapAttrsToList | ||
88 | (n: ips: map (ip: { address = ip; prefixLength = (if n == "main" && ip == pkgs.lib.head ips.ip6 then 64 else 128); }) (ips.ip6 or [])) | ||
89 | config.hostEnv.ips); | ||
90 | defaultGateway6 = { | ||
91 | address = "fe80::1"; | ||
92 | interface = "enp0s31f6"; | ||
93 | }; | ||
94 | nameservers = [ | ||
95 | "185.12.64.1" | ||
96 | "185.12.64.2" | ||
97 | "2a01:4ff:ff00::add:1" | ||
98 | "2a01:4ff:ff00::add:2" | ||
99 | ]; | ||
87 | 100 | ||
88 | wireguard.interfaces.wg0 = { | 101 | wireguard.interfaces.wg0 = { |
89 | generatePrivateKeyFile = true; | 102 | generatePrivateKeyFile = true; |