diff --git a/ops/nixos/oracle-lon01/default.nix b/ops/nixos/oracle-lon01/default.nix index a4ed8a3e27..f16c4a2de1 100644 --- a/ops/nixos/oracle-lon01/default.nix +++ b/ops/nixos/oracle-lon01/default.nix @@ -11,12 +11,12 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; fileSystems = { - "/" = { device = "/dev/mapper/ocivolume-root"; fsType = "xfs"; }; - "/boot" = { device = "/dev/sda2"; fsType = "xfs"; }; - "/boot/efi" = { device = "/dev/sda1"; fsType = "vfat"; }; + "/" = { device = "/dev/mapper/ocivolume-root2"; fsType = "xfs"; }; + "/boot" = { device = "/dev/disk/by-partuuid/31604d5f-fb84-4493-984d-08337314b763"; fsType = "xfs"; }; + "/boot/efi" = { device = "/dev/disk/by-partuuid/a919ce57-0826-446b-b951-53ae09ec3a85"; fsType = "vfat"; }; }; - nix.settings.max-jobs = lib.mkDefault 4; + nix.settings.max-jobs = lib.mkDefault 20; boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot/efi"; @@ -26,6 +26,7 @@ hostName = "oracle-lon01"; domain = "as205479.net"; hostId = "3a5eb800"; + useNetworkd = true; nameservers = [ "2001:4860:4860::8888" @@ -34,6 +35,27 @@ "8.8.4.4" ]; interfaces.enp0s3.useDHCP = true; + interfaces.enp1s0 = { + ipv4.addresses = [{ address = "10.0.0.217"; prefixLength = 24; }]; + }; + }; + systemd.network = { + networks."40-enp0s3".dhcpV4Config = { + # Use this link as a fallback; it has an IP Google believes to be in IR. + RouteMetric = 2048; + }; + networks."40-enp1s0" = { + dhcpV4Config = { + RouteMetric = 512; + }; + routes = [{ + routeConfig = { + Gateway = "10.0.0.1"; + Destination = "0.0.0.0/0"; + Metric = 512; + }; + }]; + }; }; my.ip.tailscale = "100.93.85.40"; my.systemType = "aarch64-linux";