diff --git a/machine/catacomb/default.nix b/machine/catacomb/default.nix index 1fd0665..733f6c7 100644 --- a/machine/catacomb/default.nix +++ b/machine/catacomb/default.nix @@ -84,7 +84,7 @@ in { services.rsyncd.enable = true; - /*services.samba = + services.samba = let sambaShare = path: validUsers: { path = path; @@ -137,25 +137,30 @@ in { max log size = 64 hide dot files = no - hosts allow = 10.7.3. + hosts allow = 10.22.20., 192.168.1. map archive = no unix extensions = yes ntlm auth = yes ''; - shares = { - audioRO = sambaShareRO "/nas/audio" ''@nas''; - docRO = sambaShareRO "/nas/doc/" ''@nas''; - gameRO = sambaShareRO "/nas/game/" ''@nas''; - imageRO = sambaShareRO "/nas/image" ''@nas''; - videoRO = sambaShareRO "/nas/video" ''@nas''; - #audio = sambaShare "/nas/audio" ''@nas''; - #doc = sambaShare "/nas/doc/" ''@nas''; - #game = sambaShare "/nas/game/" ''@nas''; - #image = sambaShare "/nas/image" ''@nas''; - #video = sambaShare "/nas/video" ''@nas''; + shares = let + homeShare = user: { + path = "/home/${user}"; + comment = "${user}'s home folder"; + browseable = "yes"; + "read only" = "no"; + "guest okay" = "no"; + "create mask" = "0640"; + "force create mode" = "0640"; + "directory mask" = "0750"; + "force directory mode" = "0750"; + "valid users" = "${user}"; + }; + in { + tvb = homeShare "tvb"; + katydid = homeShare "katydid"; }; - };*/ + }; services.nebula.networks.beatific = lib.recursiveUpdate beatific.nebula-defaults { enable = true;