Fix dnsmasq libvirt conflict

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/configs/system/dnsmasq/default.nix

@@ -6,12 +6,6 @@
     settings = {
       bind-interfaces = true;
       listen-address = [ "127.0.0.1" ];
-
-      server = [
-        "1.1.1.1"
-        "1.0.0.1"
-      ];
-
       conf-dir = "/etc/dnsmasq.d,*.conf";
     };
   };

hosts/common/configs/system/libvirt/default.nix

@@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   virtualisation = {
     libvirtd = {
@@ -12,16 +17,20 @@
     spiceUSBRedirection.enable = true;
   };
 
-  systemd.services.libvirtd-network-default = {
+  systemd.services = {
-    description = "Start Default Virtual Network for Libvirt";
+    libvirtd.after = lib.mkIf config.services.dnsmasq.enable [ "dnsmasq.service" ];
-    script = "${config.virtualisation.libvirtd.package}/bin/virsh net-start default";
+
-    preStop = "${config.virtualisation.libvirtd.package}/bin/virsh net-destroy default";
+    libvirtd-network-default = {
-    serviceConfig = {
+      description = "Start Default Virtual Network for Libvirt";
-      Type = "oneshot";
+      script = "${config.virtualisation.libvirtd.package}/bin/virsh net-start default";
-      RemainAfterExit = true;
+      preStop = "${config.virtualisation.libvirtd.package}/bin/virsh net-destroy default";
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+      };
+      wantedBy = [ "libvirtd.service" ];
+      after = [ "libvirtd.service" ];
     };
-    wantedBy = [ "libvirtd.service" ];
-    after = [ "libvirtd.service" ];
   };
 
   environment = {

hosts/eirene/default.nix

@@ -12,7 +12,6 @@
     ../common/configs/system/brightnessctl
     ../common/configs/system/btrfs
     ../common/configs/system/cpu
-    ../common/configs/system/dnsmasq
     ../common/configs/system/documentation
     ../common/configs/system/getty
     ../common/configs/system/git