diff --git a/aux-etc-nixos/configuration.nix b/aux-etc-nixos/configuration.nix
index eb93ccf2..14df73c9 100644
--- a/aux-etc-nixos/configuration.nix
+++ b/aux-etc-nixos/configuration.nix
@@ -97,6 +97,9 @@ in
   time.timeZone = "Asia/Hong_Kong";
   
   nixpkgs.config.allowUnfree = true;
+  services.avahi.enable = true;
+  services.avahi.publish.enable = true;
+  services.avahi.publish.userServices = true;
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.hplipWithPlugin ];
   services.printing.browsing = true;
@@ -104,6 +107,10 @@ in
   services.printing.defaultShared = true;
   hardware.sane.enable = true;
   hardware.sane.extraBackends = [ pkgs.hplipWithPlugin ];
+  systemd.sockets.cups.wants = [ "network-setup.service" ];
+  systemd.sockets.cups.after = [ "network-setup.service" ];
+  systemd.sockets.cups.wantedBy = [ "multi-user.target" ];
+  systemd.services.cups.wantedBy = [ "multi-user.target" ];
 
   users.extraUsers.root = {
     openssh.authorizedKeys.keys = [