From 2bf8e4a36c57eafa6f697d11660cc8d8e7710fbc Mon Sep 17 00:00:00 2001 From: uku Date: Thu, 9 Jan 2025 01:54:05 +0100 Subject: [PATCH] feat(etna): replace navidrome with jellyfin --- secrets/etna/navidromeEnv.age | 13 ------------ systems/etna/default.nix | 2 +- systems/etna/jellyfin.nix | 8 ++++++++ systems/etna/navidrome.nix | 37 ----------------------------------- 4 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 secrets/etna/navidromeEnv.age create mode 100644 systems/etna/jellyfin.nix delete mode 100644 systems/etna/navidrome.nix diff --git a/secrets/etna/navidromeEnv.age b/secrets/etna/navidromeEnv.age deleted file mode 100644 index 702ea5b..0000000 --- a/secrets/etna/navidromeEnv.age +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyRHJ4MktEY3JFbWFRY25M -VXlhY05oR3RDNDVuMG83bDhwbm5EcWdUT3p3ClpkeHc1cnpmcUZiMFlDYzR6UFV2 -K285THhwd3BzUUI3UE9pR05wUGlzSTAKLT4gWDI1NTE5IGhqanhuVEtXdXEzRnJI -MTdER1A3c0hYVXAvY2h0Vlp6QW1JS3pyalIzbVEKbmxHQXVGN3FDdnhtT2k4STdx -bngrVllxcUhPWERIOVhqSU9qNzJBazdRNAotPiBYMjU1MTkgQ3IzdDk0aEFCSXh2 -bW9rY3NUL2U4K1M1cmhqdklleDN4a1pSSHppU0RGNAozZmZwb05QSzVXU1podnNV -TUlNN2JURkMvQlZ2VEQwSHU0aHZtWUE5UjFJCi0tLSBtaGM0Rk4wdzFIaGl1RGxG -Tks1b3JjUHBvQmErMklVYzhOSm0wQ3ozMGgwCjE7EZVRSDqNB9M5eD9gBtcqP3cX -HYyt8BiTtTQmk4+lyqbdA4vQPt2hLyRykX0NcoMvkBOME5bxdho1NKB03jR7kpZb -2EJS2GxGyG57wIFfVOa5gcQHWaYbF69jYrO87Y06Nh5ujrL28FOWA9qUi3a5J7XF -gAXsmWpOrPSq8qZlHeA6rg== ------END AGE ENCRYPTED FILE----- diff --git a/systems/etna/default.nix b/systems/etna/default.nix index 4f96daa..1ed36ce 100644 --- a/systems/etna/default.nix +++ b/systems/etna/default.nix @@ -35,9 +35,9 @@ in ./dendrite.nix ./forgejo.nix ./immich.nix + ./jellyfin.nix ./metrics.nix ./minecraft.nix - ./navidrome.nix ./nextcloud.nix ./reposilite.nix ./satisfactory.nix diff --git a/systems/etna/jellyfin.nix b/systems/etna/jellyfin.nix new file mode 100644 index 0000000..43c72f0 --- /dev/null +++ b/systems/etna/jellyfin.nix @@ -0,0 +1,8 @@ +{ + cfTunnels."jellyfin.uku3lig.net" = "http://localhost:8096"; + + services.jellyfin = { + enable = true; + dataDir = "/data/jellyfin"; + }; +} diff --git a/systems/etna/navidrome.nix b/systems/etna/navidrome.nix deleted file mode 100644 index eef7640..0000000 --- a/systems/etna/navidrome.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - config, - _utils, - ... -}: -let - cfg = config.services.navidrome; - - env = _utils.setupSingleSecret config "navidromeEnv" { - inherit (cfg) group; - owner = cfg.user; - }; -in -{ - imports = [ env.generate ]; - - cfTunnels."navidrome.uku3lig.net" = "http://localhost:4533"; - - services.navidrome = { - enable = true; - settings = { - Address = "127.0.0.1"; - Port = 4533; - MusicFolder = "/data/subsonic/music"; - BaseUrl = "https://navidrome.uku3lig.net"; - }; - }; - - systemd.services.navidrome.serviceConfig = { - EnvironmentFile = env.path; - # https://github.com/NixOS/nixpkgs/pull/290901 - BindReadOnlyPaths = [ - "/run/systemd/resolve/stub-resolv.conf" - "/run/systemd/resolve/resolv.conf" - ]; - }; -}