nixpkgs-fmt

1 files changed, 204 insertions, 198 deletions

diff --git a/hosts/microwave/network.nix b/hosts/microwave/network.nix
index 6391122..c6a6d16 100644
--- a/hosts/microwave/network.nix
+++ b/hosts/microwave/network.nix
@@ -22,229 +22,235 @@
     "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online --any"
   ];
 
-systemd.network = {
-  enable = true;
+  systemd.network = {
+    enable = true;
 
     # wait-online.ignoredInterfaces = [ "wlan0" "enp53s0" ];
 
-      # Interfaces on the machine
-      netdevs."10-james" = {
-        netdevConfig = {
-          Name = "james";
-          Kind = "bond";
-        };
-        bondConfig = {
-          Mode = "active-backup";
-          PrimaryReselectPolicy = "always";
-          MIIMonitorSec = "1s";
-        };
+    # Interfaces on the machine
+    netdevs."10-james" = {
+      netdevConfig = {
+        Name = "james";
+        Kind = "bond";
       };
-      networks."10-ether-bond" = {
-        matchConfig = { Name = "enp53s0"; };
-        networkConfig = {
-          Bond = "james";
-          PrimarySlave = true;
-        };
+      bondConfig = {
+        Mode = "active-backup";
+        PrimaryReselectPolicy = "always";
+        MIIMonitorSec = "1s";
       };
-      networks."10-wlan-bond" = {
-        matchConfig = { Name = "wlan0"; };
-        networkConfig = {
-          Bond = "james";
-        };
+    };
+    networks."10-ether-bond" = {
+      matchConfig.Name = "enp53s0";
+      networkConfig = {
+        Bond = "james";
+        PrimarySlave = true;
       };
-      networks."10-james-bond" = {
-        matchConfig = { Name = "james"; };
-        networkConfig = {
-          DHCP = "yes";
-          IPv6AcceptRA = true;
-        };
+    };
+    networks."10-wlan-bond" = {
+      matchConfig.Name = "wlan0";
+      networkConfig = {
+        Bond = "james";
+      };
+    };
+    networks."10-james-bond" = {
+      matchConfig.Name = "james";
+      networkConfig = {
+        DHCP = "yes";
+        IPv6AcceptRA = true;
       };
+    };
 
-      # Wireguard
-      # Dump-dvb
-      netdevs."30-wg-dumpdvb" = {
-        netdevConfig = {
-          Kind = "wireguard";
-          Name = "wg-dumpdvb";
-          Description = "dvb.solutions enterprise network";
-        };
-        wireguardConfig = {
-          PrivateKeyFile = config.sops.secrets."wg/wg-dvb-seckey".path;
-        };
-        wireguardPeers = [
-          {
-            wireguardPeerConfig = {
-              PublicKey = "WDvCObJ0WgCCZ0ORV2q4sdXblBd8pOPZBmeWr97yphY=";
-              Endpoint = "academicstrokes.com:51820";
-              AllowedIPs = [ "10.13.37.0/24" ];
-              PersistentKeepalive = 25;
-            };
-          }
-        ];
+    # Wireguard
+    # Dump-dvb
+    netdevs."30-wg-dumpdvb" = {
+      netdevConfig = {
+        Kind = "wireguard";
+        Name = "wg-dumpdvb";
+        Description = "dvb.solutions enterprise network";
       };
-      networks."30-wg-dumpdvb" = {
-        matchConfig = { Name = "wg-dumpdvb"; };
-        networkConfig = {
-          Address = "10.13.37.3/24";
-          IPv6AcceptRA = true;
-        };
-        routes = [
-          { routeConfig = { Gateway = "10.13.37.1"; Destination = "10.13.37.0/24"; }; }
-        ];
+      wireguardConfig = {
+        PrivateKeyFile = config.sops.secrets."wg/wg-dvb-seckey".path;
+      };
+      wireguardPeers = [
+        {
+          wireguardPeerConfig = {
+            PublicKey = "WDvCObJ0WgCCZ0ORV2q4sdXblBd8pOPZBmeWr97yphY=";
+            Endpoint = "academicstrokes.com:51820";
+            AllowedIPs = [ "10.13.37.0/24" ];
+            PersistentKeepalive = 25;
+          };
+        }
+      ];
+    };
+    networks."30-wg-dumpdvb" = {
+      matchConfig.Name = "wg-dumpdvb";
+      networkConfig = {
+        Address = "10.13.37.3/24";
+        IPv6AcceptRA = true;
       };
+      routes = [
+        { routeConfig = { Gateway = "10.13.37.1"; Destination = "10.13.37.0/24"; }; }
+      ];
+    };
 
-      # oxalab
-      netdevs."10-wg-oxalab" = {
-        netdevConfig = {
-          Kind = "wireguard";
-          Name = "wg-oxalab";
-          Description = "lab of oxa";
-        };
-        wireguardConfig = {
-          PrivateKeyFile = config.sops.secrets."wg/oxalab-seckey".path;
-        };
-        wireguardPeers = [
-          {
-            wireguardPeerConfig = {
-              PublicKey = "5nCVC21BL+1r70OGwA4Q6Z/gcPLC3+ZF8sTurdn7N0E=";
-              Endpoint = "95.216.166.21:51820";
-              AllowedIPs = [ "10.66.66.0/24" ];
-              PersistentKeepalive = 25;
-            };
-          }
-        ];
+    # oxalab
+    netdevs."10-wg-oxalab" = {
+      netdevConfig = {
+        Kind = "wireguard";
+        Name = "wg-oxalab";
+        Description = "lab of oxa";
       };
-      networks."10-wg-oxalab" = {
-        matchConfig = { Name = "wg-oxalab"; };
-        networkConfig = {
-          Address = "10.66.66.10/24";
-          IPv6AcceptRA = true;
-        };
-        routes = [
-          { routeConfig = { Gateway = "10.66.66.1"; Destination = "10.66.66.1/24"; }; }
-        ];
+      wireguardConfig = {
+        PrivateKeyFile = config.sops.secrets."wg/oxalab-seckey".path;
       };
+      wireguardPeers = [
+        {
+          wireguardPeerConfig = {
+            PublicKey = "5nCVC21BL+1r70OGwA4Q6Z/gcPLC3+ZF8sTurdn7N0E=";
+            Endpoint = "95.216.166.21:51820";
+            AllowedIPs = [ "10.66.66.0/24" ];
+            PersistentKeepalive = 25;
+          };
+        }
+      ];
+    };
+    networks."10-wg-oxalab" = {
+      matchConfig.Name = "wg-oxalab";
+      networkConfig = {
+        Address = "10.66.66.10/24";
+        IPv6AcceptRA = true;
+      };
+      routes = [
+        { routeConfig = { Gateway = "10.66.66.1"; Destination = "10.66.66.1/24"; }; }
+      ];
+    };
 
 
-      # zentralwerk
-      netdevs."10-wg-zentralwerk" = {
-        netdevConfig = {
-          Kind = "wireguard";
-          Name = "wg-zentralwerk";
-          Description = "Tunnel to the best basement in Dresden";
-        };
-        wireguardConfig = {
-          PrivateKeyFile = config.sops.secrets."wg/wg-zw-seckey".path;
-        };
-        wireguardPeers = [
-          {
-            wireguardPeerConfig = {
-              PublicKey = "PG2VD0EB+Oi+U5/uVMUdO5MFzn59fAck6hz8GUyLMRo=";
-              Endpoint = "81.201.149.152:1337";
-              AllowedIPs = [ "172.20.72.0/21" "172.22.90.0/24" ];
-              PersistentKeepalive = 25;
-            };
-          }
-        ];
+    # zentralwerk
+    netdevs."10-wg-zentralwerk" = {
+      netdevConfig = {
+        Kind = "wireguard";
+        Name = "wg-zentralwerk";
+        Description = "Tunnel to the best basement in Dresden";
+      };
+      wireguardConfig = {
+        PrivateKeyFile = config.sops.secrets."wg/wg-zw-seckey".path;
       };
-      networks."10-wg-zentralwerk" = {
-        matchConfig = { Name = "wg-zentralwerk"; };
-        networkConfig = {
-          Address = "172.20.76.226/21";
-          IPv6AcceptRA = true;
-          DNS = "172.20.73.8";
-          Domains = [
-            "~.c3d2.de"
-            "~.zentralwerk.org"
-          ];
-        };
-        routes = [
-          {
-            routeConfig = {
-              Gateway = "172.20.72.4";
-              Destination = "172.20.72.0/21";
-            };
-          }
-          {
-            routeConfig = {
-              Gateway = "172.20.72.4";
-              Destination = "172.20.90.0/24";
-            };
-          }
+      wireguardPeers = [
+        {
+          wireguardPeerConfig = {
+            PublicKey = "PG2VD0EB+Oi+U5/uVMUdO5MFzn59fAck6hz8GUyLMRo=";
+            Endpoint = "81.201.149.152:1337";
+            AllowedIPs = [ "172.20.72.0/21" "172.22.90.0/24" ];
+            PersistentKeepalive = 25;
+          };
+        }
+      ];
+    };
+    networks."10-wg-zentralwerk" = {
+      matchConfig.Name = "wg-zentralwerk";
+      networkConfig = {
+        Address = "172.20.76.226/21";
+        IPv6AcceptRA = true;
+        DNS = "172.20.73.8";
+        Domains = [
+          "~.c3d2.de"
+          "~.zentralwerk.org"
         ];
       };
+      routes = [
+        {
+          routeConfig = {
+            Gateway = "172.20.72.4";
+            Destination = "172.20.72.0/21";
+          };
+        }
+        {
+          routeConfig = {
+            Gateway = "172.20.72.4";
+            Destination = "172.20.90.0/24";
+          };
+        }
+      ];
+    };
 
-      # VPN
-      netdevs."10-wg-mullvad" = {
-        netdevConfig = {
-          Kind = "wireguard";
-          Name = "wg-mullvad";
-        };
-        wireguardConfig = {
-          PrivateKeyFile = config.sops.secrets."wg/mlwd-nl-seckey".path;
-          FirewallMark = 34952; # 0x8888
-          RouteTable = "off";
-        };
-        wireguardPeers = [
-          {
-            wireguardPeerConfig = {
-              PublicKey = "C6SfQFOfq6/q9nHRdLDN98U/BTxH47Ec1l/PaQZuRk4=";
-              Endpoint = "169.150.196.2:51820";
-              AllowedIPs = [ "0.0.0.0/0" "::0/0" ];
-            };
-          }
-        ];
+    # VPN
+    netdevs."10-wg-mullvad" = {
+      netdevConfig = {
+        Kind = "wireguard";
+        Name = "wg-mullvad";
+      };
+      wireguardConfig = {
+        PrivateKeyFile = config.sops.secrets."wg/mlwd-nl-seckey".path;
+        FirewallMark = 34952; # 0x8888
+        RouteTable = "off";
+      };
+      wireguardPeers = [
+        {
+          wireguardPeerConfig = {
+            PublicKey = "C6SfQFOfq6/q9nHRdLDN98U/BTxH47Ec1l/PaQZuRk4=";
+            Endpoint = "169.150.196.2:51820";
+            AllowedIPs = [ "0.0.0.0/0" "::0/0" ];
+          };
+        }
+      ];
+    };
+    networks."10-wg-mullvad" = {
+      matchConfig.Name = "wg-mullvad";
+      address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ];
+      networkConfig = {
+        DNS = "10.64.0.1";
+        DNSDefaultRoute = true;
+        Domains = [ "~." ];
       };
-      networks."10-wg-mullvad" = {
-        address = [ "10.65.79.164/32" "fc00:bbbb:bbbb:bb01::2:4fa3/128" ];
-        matchConfig.Name = "wg-mullvad";
-        networkConfig = {
-          DNS = "10.64.0.1";
-          DNSDefaultRoute = true;
-          Domains = [ "~." ];
-        };
-        routes  = map (gate: {
+      routes = map
+        (gate: {
           routeConfig = {
             Gateway = gate;
             Table = 1000;
           };
-        }) [ "0.0.0.0" "::" ];
+        }) [
+        "0.0.0.0"
+        "::"
+      ];
 
-       routingPolicyRules = [
-         {
-           routingPolicyRuleConfig = {
-             Family = "both";
-             FirewallMark = 34952; # 0x8888
-             InvertRule = true;
-             Table = "1000";
-             Priority = 10;
-           };
-         }
-         {
-           routingPolicyRuleConfig = {
-             Family = "both";
-             SuppressPrefixLength = 0;
-             Table = "main";
-             Priority = 9;
-           };
-         }
-       ] ++ map (net: { # only route global addresses over VPN
-       routingPolicyRuleConfig = {
-         Priority = 8;
-         To = net;
-       };
-     }) [
-       # Public
-       "169.150.196.2/32"
-       # "10.0.0.0/8"
-       "10.13.37.0/24"
-       "10.66.66.0/24"
-       # "172.16.0.0/12"
-       "172.16.0.0/12"
-       # "182.168.0.0/16"
-       "182.168.0.0/16"
-       # "fc00::/7"
-     ];
+      routingPolicyRules = [
+        {
+          routingPolicyRuleConfig = {
+            Family = "both";
+            FirewallMark = 34952; # 0x8888
+            InvertRule = true;
+            Table = "1000";
+            Priority = 10;
+          };
+        }
+        {
+          routingPolicyRuleConfig = {
+            Family = "both";
+            SuppressPrefixLength = 0;
+            Table = "main";
+            Priority = 9;
+          };
+        }
+      ] ++ map
+        (net: {
+          # only route global addresses over VPN
+          routingPolicyRuleConfig = {
+            Priority = 8;
+            To = net;
+          };
+        }) [
+        # Public
+        "169.150.196.2/32"
+        # "10.0.0.0/8"
+        "10.13.37.0/24"
+        "10.66.66.0/24"
+        # "172.16.0.0/12"
+        "172.16.0.0/12"
+        # "182.168.0.0/16"
+        "182.168.0.0/16"
+        # "fc00::/7"
+      ];
     };
   };
 }