diff --git a/Timeline.org b/Timeline.org
index 4d425fe..617a2e7 100644
--- a/Timeline.org
+++ b/Timeline.org
@@ -10,7 +10,8 @@
     CLOSED: [2019-10-18 Fri 00:03]
 *** TODO Tmux 
 *** TODO Smartmontools
-*** TODO Zeroconf
+*** DONE Zeroconf
+    CLOSED: [2019-10-23 Wed 00:51]
 ** Printing
 *** TODO Cups
 *** TODO SANE
diff --git a/configuration.nix b/configuration.nix
index cd5fb8a..8f13505 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -80,6 +80,23 @@
     allowReboot = true;
   };
 
+  # Enable zeroconf
+  services.avahi = {
+    enable = true;
+    nssmdns = true;
+    publish = {
+      enable = true;
+      userServices = true;
+      workstation = true;
+    };
+  };
+
+  # Start a tmux session
+  #program.tmux.enable = true;
 
   # Import other configuration modules
+  #imports = [
+    #./networking.nix
+  #];
+
 }