From d0b7116176161f2fc3351598c58fc653d693cc66 Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Sun, 26 Feb 2023 10:21:26 +0100
Subject: [PATCH] hosts: virqfd isn't a module anymore, restart vswitch after
 update

---
 hosts/desktop/hardware-configuration.nix | 6 +++++-
 hosts/nas/hardware-configuration.nix     | 7 ++++++-
 hosts/server/hardware-configuration.nix  | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index 3033c91..d1b1f2c 100644
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -18,7 +18,7 @@
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" "vfio_virqfd" ];
+  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
   boot.tmpOnTmpfs = true;
@@ -159,6 +159,10 @@
     #};
   };
 
+  systemd.services = {
+    ovs-vswitchd.partOf = [ "network-setup.service" ];
+  };
+
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   # high-resolution display
   hardware.video.hidpi.enable = lib.mkDefault true;
diff --git a/hosts/nas/hardware-configuration.nix b/hosts/nas/hardware-configuration.nix
index e8c727b..9b90ae3 100644
--- a/hosts/nas/hardware-configuration.nix
+++ b/hosts/nas/hardware-configuration.nix
@@ -18,7 +18,7 @@
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" "vfio_virqfd" ];
+  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
   boot.initrd.secrets = {
     "/root/NASKeyfile" =
         /root/NASKeyfile;
@@ -226,6 +226,11 @@
     #  #allowedTCPPorts = [ 53 80 443 9443 ];
     #};
   };
+
+  systemd.services = {
+    ovs-vswitchd.partOf = [ "network-setup.service" ];
+  };
+
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   powerManagement = {
     cpuFreqGovernor = lib.mkDefault "powersave";
diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix
index d89aebd..5b77b5b 100644
--- a/hosts/server/hardware-configuration.nix
+++ b/hosts/server/hardware-configuration.nix
@@ -18,7 +18,7 @@
     ];
 
   boot.initrd.availableKernelModules = [  "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "ahci" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" "vfio_virqfd" ];
+  boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
   boot.tmpOnTmpfs = true;