Fixed merge conflict

config/fudo/garbage-collector.nix

@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.fudo.garbage-collector;
+
+in {
+
+  options.fudo.garbage-collector = {
+    enable = mkEnableOption "Enable periodic NixOS garbage collection";
+
+    timing = mkOption {
+      type = types.str;
+      default = "weekly";
+      description = "Period (systemd format) at which to run garbage collector.";
+    };
+
+    age = mkOption {
+      type = types.str;
+      default = "30d";
+      description = "Age of garbage to collect (eg. 30d).";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd = {
+      timers.fudo-garbage-collector = {
+        enable = true;
+        description = "Collect NixOS garbage older than ${cfg.age}";
+        partOf = [ "fudo-garbage-collector.service" ];
+        wantedBy = [ "timers.target" ];
+        timerConfig = {
+          OnCalendar = cfg.timing;
+        };
+      };
+
+      services.fudo-garbage-collector = {
+        enable = true;
+        serviceConfig = {
+          Type = "oneshot";
+          StandardOutput = "journal";
+        };
+        script = ''
+          ${pkgs.nix}/bin/nix-collect-garbage --delete-older-than ${cfg.age}
+        '';
+      };
+    };
+  };
+}

config/fudo/local-network.nix

@@ -20,10 +20,11 @@ let
       };
 
       mac-address = mkOption {
-        type = types.str;
+        type = with types; nullOr types.str;
         description = ''
           The MAC address of a given host, if desired for IP reservation.
         '';
+        default = null;
       };
 
       ssh-fingerprints = mkOption {
@@ -43,7 +44,7 @@ in {
     enable = mkEnableOption "Enable local network configuration (DHCP & DNS).";
 
     hosts = mkOption {
-      type = with types; loaOf (submodule hostOpts);
+      type = with types; attrsOf (submodule hostOpts);
       default = {};
       description = "A map of hostname => { host_attributes }.";
     };
@@ -74,7 +75,7 @@ in {
     };
 
     aliases = mkOption {
-      type = with types; loaOf str;
+      type = with types; attrsOf str;
       default = {};
       description = "A mapping of host-alias => hostname to use on the local network.";
     };
@@ -148,7 +149,7 @@ in {
         ethernetAddress = hostOpts.mac-address;
         hostName = hostname;
         ipAddress = hostOpts.ip-address;
-      }) cfg.hosts;
+      }) (filterAttrs (host: hostOpts: hostOpts.mac-address != null) cfg.hosts);
 
       interfaces = cfg.dhcp-interfaces;
 
@@ -210,6 +211,13 @@ in {
       cacheNetworks = [ cfg.network "localhost" "localnets" ];
       forwarders = [ cfg.recursive-resolver ];
       listenOn = cfg.dns-serve-ips;
+      extraOptions = concatStringsSep "\n" [
+        "dnssec-enable yes;"
+        "dnssec-validation yes;"
+        "auth-nxdomain no;"
+        "recursion yes;"
+        "allow-recursion { any; };"
+      ];
       zones = [
         {
           master = true;

config/local.nix

@@ -10,6 +10,7 @@ with lib;
     ./fudo/client/dns.nix
     ./fudo/common.nix
     ./fudo/dns.nix
+    ./fudo/garbage-collector.nix
     ./fudo/git.nix
     ./fudo/grafana.nix
     ./fudo/kdc.nix