diff --git a/modules/nixos/samba.nix b/modules/nixos/samba.nix
index 2a861b6..486b1c4 100644
--- a/modules/nixos/samba.nix
+++ b/modules/nixos/samba.nix
@@ -9,6 +9,17 @@
       global = {
         "vfs objects" = "catia fruit streams_xattr";
         # "fruit:model" = "MacPro7,1@ECOLOR=226,226,224";
+        "fruit:model" = "MacSamba";
+      };
+
+      Cloud = {
+        path = "/mnt/sdb1/cloud";
+        writeable = "yes";
+      };
+
+      Media = {
+        path = "/mnt/sdb1/media";
+        writeable = "yes";
       };
 
       TimeMachine = {
@@ -19,5 +30,16 @@
     };
   };
 
+  ## Used to advertise the shares to Windows hosts
+  services.samba-wsdd = {
+    enable = true;
+  };
+
+  services.avahi = {
+    enable = true;
+    publish.enable = true;
+    publish.userServices = true;
+  };
+
   users.users.jan.extraGroups = [ "samba" ];
 }