From 892d87612a176acdfc792472da3e317fab2d5065 Mon Sep 17 00:00:00 2001 From: Jan Kremer Date: Wed, 11 Mar 2026 13:34:40 +0100 Subject: [PATCH] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update samba config Flake lock file updates: • Updated input 'copyparty': 'github:9001/copyparty/ab8bd0178b26a0b6c6406f7bae835d13b16ef188?narHash=sha256-B1j0ahVuxyZtpbFfy34gk2DjacimPIuzyzCPvDhvxI4%3D' (2026-02-23) → 'github:9001/copyparty/8a9066c35cd94226ee0e99d5d36e8b630ed8d2a3?narHash=sha256-QDBoepUZNQaIEvOqCGku6XjUp2sSh%2B7xamA8vNe9HlQ%3D' (2026-03-11) • Updated input 'darwin': 'github:LnL7/nix-darwin/6a7fdcd5839ec8b135821179eea3b58092171bcf?narHash=sha256-9SeTZ4Pwr730YfT7V8Azb8GFbwk1ZwiQDAwft3qAD%2Bo%3D' (2026-02-19) → 'github:LnL7/nix-darwin/da529ac9e46f25ed5616fd634079a5f3c579135f?narHash=sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE%3D' (2026-03-08) • Updated input 'home-manager': 'github:nix-community/home-manager/9a4b494b1aa1b93d8edf167f46dc8e0c0011280c?narHash=sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ%3D' (2026-02-23) → 'github:nix-community/home-manager/3f98e2bbc661ec0aaf558d8a283d6955f05f1d09?narHash=sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k%3D' (2026-03-10) • Removed input 'nixos-hardware' • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0182a361324364ae3f436a63005877674cf45efb?narHash=sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ%3D' (2026-02-17) → 'github:NixOS/nixpkgs/9dcb002ca1690658be4a04645215baea8b95f31d?narHash=sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs%3D' (2026-03-08) --- flake.lock | 41 ++++++++++++----------------------------- modules/nixos/samba.nix | 19 +++++++++++-------- 2 files changed, 23 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index b8c2e12..adefc1b 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1771834427, - "narHash": "sha256-B1j0ahVuxyZtpbFfy34gk2DjacimPIuzyzCPvDhvxI4=", + "lastModified": 1773190009, + "narHash": "sha256-QDBoepUZNQaIEvOqCGku6XjUp2sSh+7xamA8vNe9HlQ=", "owner": "9001", "repo": "copyparty", - "rev": "ab8bd0178b26a0b6c6406f7bae835d13b16ef188", + "rev": "8a9066c35cd94226ee0e99d5d36e8b630ed8d2a3", "type": "github" }, "original": { @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1771520882, - "narHash": "sha256-9SeTZ4Pwr730YfT7V8Azb8GFbwk1ZwiQDAwft3qAD+o=", + "lastModified": 1773000227, + "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "6a7fdcd5839ec8b135821179eea3b58092171bcf", + "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f", "type": "github" }, "original": { @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1771851181, - "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=", + "lastModified": 1773179137, + "narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=", "owner": "nix-community", "repo": "home-manager", - "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c", + "rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09", "type": "github" }, "original": { @@ -142,29 +142,13 @@ "type": "github" } }, - "nixos-hardware": { - "locked": { - "lastModified": 1771423359, - "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -180,7 +164,6 @@ "copyparty": "copyparty", "darwin": "darwin_2", "home-manager": "home-manager_2", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" } }, diff --git a/modules/nixos/samba.nix b/modules/nixos/samba.nix index 5d5f39c..b8c1d78 100644 --- a/modules/nixos/samba.nix +++ b/modules/nixos/samba.nix @@ -1,42 +1,45 @@ -{ pkgs, ... }: { services.samba = { enable = true; - package = pkgs.samba4Full; - usershares.enable = true; settings = { global = { "vfs objects" = "catia fruit streams_xattr"; "fruit:model" = "MacPro7,1@ECOLOR=226,226,224"; + "force user" = "jan"; }; Cloud = { path = "/mnt/cloud"; writeable = "yes"; + "valid users" = "jan"; }; Media = { path = "/mnt/media"; writeable = "yes"; + "valid users" = "jan"; }; TimeMachine = { path = "/mnt/timemachine"; writeable = "yes"; "fruit:time machine" = "yes"; + "fruit:time machine max size" = "1000G"; + "valid users" = "jan"; }; }; }; ## Used to advertise the shares to Windows hosts - services.samba-wsdd = { - enable = true; - }; + services.samba-wsdd.enable = true; services.avahi = { enable = true; - publish.enable = true; - publish.userServices = true; + nssmdns4 = true; + publish = { + enable = true; + userServices = true; + }; }; }