diff --git a/hosts/zackbiene/default.nix b/hosts/zackbiene/default.nix
index 96943ec..cd024ce 100644
--- a/hosts/zackbiene/default.nix
+++ b/hosts/zackbiene/default.nix
@@ -16,12 +16,13 @@
     ./fs.nix
     ./net.nix
 
-    ./home-assistant.nix
-    ./mosquitto.nix
-    ./zigbee2mqtt.nix
+    ./dnsmasq.nix
     ./esphome.nix
-    ./nginx.nix
+    ./home-assistant.nix
     ./hostapd.nix
+    ./mosquitto.nix
+    ./nginx.nix
+    ./zigbee2mqtt.nix
   ];
 
   boot.loader.grub.enable = false;
diff --git a/hosts/zackbiene/dnsmasq.nix b/hosts/zackbiene/dnsmasq.nix
new file mode 100644
index 0000000..59ae637
--- /dev/null
+++ b/hosts/zackbiene/dnsmasq.nix
@@ -0,0 +1,19 @@
+{
+  services.dnsmasq = {
+    enable = true;
+    resolveLocalQueries = false;
+    extraConfig = ''
+      interface=wlan1
+
+      dhcp-authoritative
+      dhcp-range=10.0.90.10,10.0.90.240,24h
+      dhcp-range=fd90::10,fd90::ff0,24h
+
+      enable-ra
+      # Never forward addresses in the non-routed address spaces.
+      bogus-priv
+
+      no-resolv
+    '';
+  };
+}
diff --git a/hosts/zackbiene/home-assistant.nix b/hosts/zackbiene/home-assistant.nix
index 13059d5..bff561f 100644
--- a/hosts/zackbiene/home-assistant.nix
+++ b/hosts/zackbiene/home-assistant.nix
@@ -38,11 +38,53 @@ in {
           manual = "!include manual.yaml";
         };
       };
-      #frontend = {
-      #  themes = "!include_dir_merge_named themes";
-      #};
-      default_config = {};
       met = {};
+
+      #### only selected components from default_config ####
+
+      automation = {};
+      backup = {};
+      bluetooth = {};
+      config = {};
+      #conversation = {};
+      counter = {};
+      dhcp = {};
+      energy = {};
+      frontend = {
+        #themes = "!include_dir_merge_named themes";
+      };
+      hardware = {};
+      history = {};
+      homeassistant_alerts = {};
+      #cloud = {};
+      image_upload = {};
+      input_boolean = {};
+      input_button = {};
+      input_datetime = {};
+      input_number = {};
+      input_select = {};
+      input_text = {};
+      logbook = {};
+      logger = {};
+      map = {};
+      #media_source = {};
+      mobile_app = {};
+      #my = {};
+      network = {};
+      person = {};
+      schedule = {};
+      scene = {};
+      script = {};
+      ssdp = {};
+      stream = {};
+      sun = {};
+      system_health = {};
+      tag = {};
+      timer = {};
+      #usb = {};
+      webhook = {};
+      zeroconf = {};
+      zone = {};
     };
     extraPackages = python3Packages:
       with python3Packages; [