From 02da52ae167b504bfa5a9b5772473a17a727615c Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 29 Dec 2022 20:02:20 +0100
Subject: ...

---
 hosts/sif/default.nix | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'hosts/sif/default.nix')

diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 76f3c1db..4c405436 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -269,27 +269,24 @@ in {
     services.dnsmasq = {
       enable = true;
       resolveLocalQueries = false;
-      servers = [];
-      extraConfig = ''
-        enable-ra
-        local=/libvirt/
-        domain-needed
-        expand-hosts
-        bogus-priv
-        no-hosts
-        listen-address=192.168.122.1
-        listen-address=fd45:febc:b028::
-        interface=virbr0
-        except-interface=lo
-        bind-interfaces
-        domain=libvirt,192.168.122.0/24
-        dhcp-range=192.168.122.128,192.168.122.254,1h
-        dhcp-range=fd45:febc:b028::1,fd45:febc:b028:0:ffff:ffff:ffff:ffff,ra-names,1h
-        dhcp-host=52:54:00:18:85:5b,sif,192.168.122.1
-        dhcp-authoritative
-        dhcp-rapid-commit
-        dhcp-option=option6:dns-server,[fd45:febc:b028::]
-      '';
+      settings = {
+        enable-ra = true;
+        local = "/libvirt/";
+        domain-needed = true;
+        expand-hosts = true;
+        bogus-priv = true;
+        no-hosts = true;
+        listen-address = [ "192.168.122.1" "fd45:febc:b028::" ];
+        interface = "virbr0";
+        except-interface = "lo";
+        bind-interfaces = true;
+        domain = "libvirt,192.168.122.0/24";
+        dhcp-range = [ "192.168.122.128,192.168.122.254,1h" "fd45:febc:b028::1,fd45:febc:b028:0:ffff:ffff:ffff:ffff,ra-names,1h" ];
+        dhcp-host = [ "52:54:00:18:85:5b,sif,192.168.122.1" ];
+        dhcp-authoritative = true;
+        dhcp-rapid-commit = true;
+        dhcp-option = "option6:dns-server,[fd45:febc:b028::]";
+      };
     };
     systemd.services.dnsmasq = {
       bindsTo = ["sys-subsystem-net-devices-virbr0.device"];
-- 
cgit v1.2.3