From 9d19064874c94e66f096c26a87cc2fc08fd5739f Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Sat, 1 Mar 2025 13:17:59 +0000
Subject: [PATCH] Fix dnsmasq libvirt conflict

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 .../common/configs/system/dnsmasq/default.nix |  6 ----
 .../common/configs/system/libvirt/default.nix | 29 ++++++++++++-------
 hosts/eirene/default.nix                      |  1 -
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/hosts/common/configs/system/dnsmasq/default.nix b/hosts/common/configs/system/dnsmasq/default.nix
index b49ea97..e07b22e 100644
--- a/hosts/common/configs/system/dnsmasq/default.nix
+++ b/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";
     };
   };
diff --git a/hosts/common/configs/system/libvirt/default.nix b/hosts/common/configs/system/libvirt/default.nix
index 2ed7f27..da1afae 100644
--- a/hosts/common/configs/system/libvirt/default.nix
+++ b/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 = {
-    description = "Start Default Virtual Network for Libvirt";
-    script = "${config.virtualisation.libvirtd.package}/bin/virsh net-start default";
-    preStop = "${config.virtualisation.libvirtd.package}/bin/virsh net-destroy default";
-    serviceConfig = {
-      Type = "oneshot";
-      RemainAfterExit = true;
+  systemd.services = {
+    libvirtd.after = lib.mkIf config.services.dnsmasq.enable [ "dnsmasq.service" ];
+
+    libvirtd-network-default = {
+      description = "Start Default Virtual Network for Libvirt";
+      script = "${config.virtualisation.libvirtd.package}/bin/virsh net-start default";
+      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 = {
diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix
index a479728..9ce1e66 100644
--- a/hosts/eirene/default.nix
+++ b/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