From 40df8e738da6f48010ca8287e7261f90b7f8c938 Mon Sep 17 00:00:00 2001 From: catvayor Date: Fri, 6 Dec 2024 14:41:02 +0100 Subject: [PATCH] chore: nothing --- machines/roam01/_hardware-configuration.nix | 8 ++------ machines/roam01/wireguard.nix | 8 ++------ machines/router02/wireguard.nix | 8 ++------ machines/routexp01/networking.nix | 3 +-- modules/lab-routexp/default.nix | 8 ++------ 5 files changed, 9 insertions(+), 26 deletions(-) diff --git a/machines/roam01/_hardware-configuration.nix b/machines/roam01/_hardware-configuration.nix index 94ca620..1c56f46 100644 --- a/machines/roam01/_hardware-configuration.nix +++ b/machines/roam01/_hardware-configuration.nix @@ -9,9 +9,7 @@ }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot = { initrd = { @@ -42,9 +40,7 @@ ]; }; - swapDevices = [ - { device = "/dev/disk/by-uuid/6518c729-a0cb-41b4-acc8-ec219d0afba6"; } - ]; + swapDevices = [ { device = "/dev/disk/by-uuid/6518c729-a0cb-41b4-acc8-ec219d0afba6"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/machines/roam01/wireguard.nix b/machines/roam01/wireguard.nix index aa68f46..a3dee30 100644 --- a/machines/roam01/wireguard.nix +++ b/machines/roam01/wireguard.nix @@ -14,9 +14,7 @@ let { Endpoint = "129.199.146.230:1194"; PersistentKeepalive = 25; - AllowedIPs = [ - "fdaa::${prefix}:0/64" - ]; + AllowedIPs = [ "fdaa::${prefix}:0/64" ]; PublicKey = peer.key; }; in @@ -28,9 +26,7 @@ in networks = { "50-wg-mgmt" = { name = "wg-mgmt"; - address = [ - "fdaa::${lib.toHexString (dgn-keys.getVpnKey "wg-mgmt" name).id}/64" - ]; + address = [ "fdaa::${lib.toHexString (dgn-keys.getVpnKey "wg-mgmt" name).id}/64" ]; routes = [ { Destination = "fdaa::/64"; diff --git a/machines/router02/wireguard.nix b/machines/router02/wireguard.nix index bbb57ef..1a44f68 100644 --- a/machines/router02/wireguard.nix +++ b/machines/router02/wireguard.nix @@ -12,9 +12,7 @@ let peer = dgn-keys.getVpnKey "wg-mgmt" peerName; in { - AllowedIPs = [ - "fdaa::${prefix}:${lib.toHexString peer.id}/32" - ]; + AllowedIPs = [ "fdaa::${prefix}:${lib.toHexString peer.id}/32" ]; PublicKey = peer.key; }; in @@ -26,9 +24,7 @@ in networks = { "50-wg-mgmt" = { name = "wg-mgmt"; - address = [ - "fdaa::${lib.toHexString (dgn-keys.getVpnKey "wg-mgmt" name).id}/64" - ]; + address = [ "fdaa::${lib.toHexString (dgn-keys.getVpnKey "wg-mgmt" name).id}/64" ]; routes = [ { Destination = "fdaa::/64"; diff --git a/machines/routexp01/networking.nix b/machines/routexp01/networking.nix index 2c63c08..ffcd441 100644 --- a/machines/routexp01/networking.nix +++ b/machines/routexp01/networking.nix @@ -1,2 +1 @@ -{ -} +{ } diff --git a/modules/lab-routexp/default.nix b/modules/lab-routexp/default.nix index 922686f..e0ea3fe 100644 --- a/modules/lab-routexp/default.nix +++ b/modules/lab-routexp/default.nix @@ -89,18 +89,14 @@ in name = "20-ens${builtins.toString (20 + i)}"; value = { name = "ens${builtins.toString (20 + i)}"; - address = [ - "fdfd:1794:0:${builtins.toString vlan}::${builtins.toString cfg.id}/64" - ]; + address = [ "fdfd:1794:0:${builtins.toString vlan}::${builtins.toString cfg.id}/64" ]; }; }) cfg.connections ) // { "20-babel-local" = { name = "babel-local"; - address = [ - "fdfd:1794::${builtins.toString cfg.id}/64" - ]; + address = [ "fdfd:1794::${builtins.toString cfg.id}/64" ]; }; }; netdevs = {