diff --git a/nixos/boxes/colony.nix b/nixos/boxes/colony.nix index 2b5dcb8..13ae7c2 100644 --- a/nixos/boxes/colony.nix +++ b/nixos/boxes/colony.nix @@ -22,6 +22,8 @@ { imports = [ "${modulesPath}/profiles/qemu-guest.nix" ]; + networking.domain = "nl1.int.nul.ie"; + boot.kernelParams = [ "intel_iommu=on" ]; boot.loader.systemd-boot.configurationLimit = 20; fileSystems = { @@ -50,20 +52,24 @@ pciutils ]; - networking = { - interfaces = mkIf (!config.my.build.isDevVM) { - enp10s0.useDHCP = true; - }; - }; - systemd = { network = { + links = { + "10-base-ext" = { + matchConfig.MACAddress = "52:54:00:81:bd:a1"; + linkConfig.Name = "base-ext"; + }; + }; netdevs."25-base".netdevConfig = { Name = "base"; Kind = "bridge"; }; networks = { "80-base" = networkdAssignment "base" assignments.internal; + "80-base-ext" = { + matchConfig.Name = "base-ext"; + networkConfig.Bridge = "base"; + }; "80-vm-tap" = { matchConfig = { # Don't think we have control over the name of the TAP from qemu-bridge-helper (or how to easily pick diff --git a/nixos/default.nix b/nixos/default.nix index 7e44e2e..6b5a31b 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -60,7 +60,7 @@ let }; system.name = name; - networking.hostName = mkDefault name; + networking.hostName = mkDefault (config'.assignments.internal.name or name); nixpkgs = { inherit (config') system; # Make sure any previously set overlays (e.g. lib which will be inherited by home-manager down the diff --git a/nixos/modules/network.nix b/nixos/modules/network.nix index f86d3bc..dc238af 100644 --- a/nixos/modules/network.nix +++ b/nixos/modules/network.nix @@ -11,6 +11,8 @@ in enableIPv6 = mkDefault true; useNetworkd = mkDefault true; }; + + services.resolved.domains = [ config.networking.domain ]; } (mkIf config.my.build.isDevVM { diff --git a/nixos/vms/estuary.nix b/nixos/vms/estuary.nix index 3cc88d5..48c7778 100644 --- a/nixos/vms/estuary.nix +++ b/nixos/vms/estuary.nix @@ -5,7 +5,7 @@ home-manager = "unstable"; assignments.internal = { - name = "estuary.vm"; + name = "estuary-vm"; altNames = [ "fw" ]; ipv4 = { address = "10.100.0.1"; @@ -24,6 +24,8 @@ config = mkMerge [ { + networking.domain = "nl1.int.nul.ie"; + boot.kernelParams = [ "console=ttyS0,115200n8" ]; fileSystems = { "/boot" = {