diff --git a/modules/nixos/samba.nix b/modules/nixos/samba.nix
index d8c93cc..1a57ba3 100644
--- a/modules/nixos/samba.nix
+++ b/modules/nixos/samba.nix
@@ -1,12 +1,15 @@
+{ pkgs, ... }:
 {
   services.samba = {
     enable = true;
+    package = pkgs.samba4Full;
+    usershares.enable = true;
 
     settings = {
       global = {
         "vfs objects" = "catia fruit streams_xattr";
-        "guest account" = "jan";
         "fruit:model" = "MacPro7,1@ECOLOR=226,226,224";
+        # "guest account" = "jan";
       };
 
       Cloud = {
@@ -34,6 +37,9 @@
 
   services.avahi = {
     enable = true;
-    nssmdns4 = true;
+    publish.enable = true;
+    publish.userServices = true;
   };
+
+  users.users.jan.extraGroups = [ "samba" ];
 }