diff --git a/hosts/cyper-proxy/configuration.nix b/hosts/cyper-proxy/configuration.nix index e721792..302e85b 100644 --- a/hosts/cyper-proxy/configuration.nix +++ b/hosts/cyper-proxy/configuration.nix @@ -13,16 +13,9 @@ systemd.network = { enable = true; - networks."10-venet" = { - matchConfig.Name = "venet0"; - networkConfig = { - Address = "178.254.8.35/24"; - DNS = "178.254.16.141 178.254.16.151"; - DHCP = "no"; - }; - routes = [ - { routeConfig.Destination = "0.0.0.0/0"; } - ]; + networks."10-eth" = { + matchConfig.Name = "en* eth*"; # catches both naming schemes + networkConfig.DHCP = "yes"; }; }; diff --git a/hosts/cyper-proxy/hardware-configuration.nix b/hosts/cyper-proxy/hardware-configuration.nix index ac3fc03..c86f68b 100644 --- a/hosts/cyper-proxy/hardware-configuration.nix +++ b/hosts/cyper-proxy/hardware-configuration.nix @@ -1,21 +1,35 @@ { lib, modulesPath, ... }: - { imports = [ (modulesPath + "/installer/scan/not-detected.nix") + (modulesPath + "/profiles/qemu-guest.nix") ]; boot = { - initrd.availableKernelModules = [ ]; + initrd.availableKernelModules = [ + "virtio_pci" + "virtio_blk" + "virtio_net" + "ahci" + "xhci_pci" + ]; initrd.kernelModules = [ ]; kernelModules = [ ]; extraModulePackages = [ ]; - loader.grub.enable = false; + loader.systemd-boot.enable = true; + loader.efi.canTouchEfiVariables = true; }; - fileSystems."/" = { - device = "/dev/disk/by-label/NIXROOT"; - fsType = "ext4"; + fileSystems = { + "/" = { + device = "/dev/disk/by-label/NIXROOT"; + fsType = "ext4"; + }; + + "/boot" = { + device = "/dev/disk/by-label/NIXBOOT"; + fsType = "vfat"; + }; }; swapDevices = [ ]; diff --git a/nixos/default.nix b/nixos/default.nix index 9fccf48..d3fa149 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -51,6 +51,7 @@ }; }; + # TODO: Get rid of this virtualisation = lib.mkIf isServer { vmVariant = { virtualisation = { diff --git a/nixos/virt.nix b/nixos/virt.nix index 127e652..e435cac 100644 --- a/nixos/virt.nix +++ b/nixos/virt.nix @@ -10,6 +10,7 @@ quickemu quickgui nemu + OVMF ]; systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware"