From 405e96d81222d4a4147a91819fd300c4406a9e48 Mon Sep 17 00:00:00 2001 From: asonix Date: Wed, 21 Aug 2024 15:28:36 -0500 Subject: [PATCH] Update flake, jellyfin add samba --- flake.lock | 18 +++++++++--------- flake.nix | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index beb2e1b..a89131b 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720915306, - "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", + "lastModified": 1721524707, + "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", + "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1720926522, - "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b7eb408..59e0f39 100644 --- a/flake.nix +++ b/flake.nix @@ -659,11 +659,44 @@ { }; }) (if unlockMounts && mountVolumes && enableJellyfin then { - services.jellyfin = { - enable = true; - openFirewall = true; - }; users.users.asonix.extraGroups = [ "jellyfin" ]; + services = { + jellyfin = { + enable = true; + openFirewall = true; + }; + + samba = { + enable = true; + securityType = "user"; + openFirewall = true; + extraConfig = '' + workgroup = WORKGROUP + server string = jellyfin + netbios name = jellyfin + security = user + hosts allow 192.168.5. 127.0.0.1 localhost + hosts deny 0.0.0.0/0 + guest account = nobody + map to guest = bad user + ''; + shares.private = { + path = "/storage/jellyfin"; + browsable = "yes"; + "read only" = "no"; + "guest ok" = "no"; + "create mask" = "0644"; + "directory mask" = "0755"; + "force user" = "jellyfin"; + "force group" = "jellyfin"; + }; + }; + + samba-wsdd = { + enable = true; + openFirewall = true; + }; + }; } else { }) ]; };