From fb1fc759089fff0f51f42fb4c973f5dc40c92874 Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Fri, 16 May 2025 14:19:14 +0200
Subject: [PATCH] use regular address instead of unix socket for navidrome

this fixes permission issues on the unix socket
---
 sys/machines/hopper/lab/caddy.nix             | 2 +-
 sys/machines/hopper/lab/navidrome/default.nix | 3 +--
 sys/machines/hopper/lab/vpn-namespace.nix     | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/machines/hopper/lab/caddy.nix b/sys/machines/hopper/lab/caddy.nix
index 7e8713d..3103ab3 100644
--- a/sys/machines/hopper/lab/caddy.nix
+++ b/sys/machines/hopper/lab/caddy.nix
@@ -40,7 +40,7 @@ in {
       };
     in {
       jellyfin = mkPublicEntry "jellyfin" "${bridge}:8096";
-      navidrome = mkPublicEntry "navidrome" "unix//var/lib/navidrome/navidrome.sock";
+      navidrome = mkPublicEntry "navidrome" "${bridge}:${toString config.services.navidrome.settings.Port}";
       vaultwarden = mkPublicEntry "vw" "${bridge}:${toString config.services.vaultwarden.config.ROCKET_PORT}";
       abs = mkPublicEntry "abs" "${bridge}:${toString config.services.audiobookshelf.port}";
 
diff --git a/sys/machines/hopper/lab/navidrome/default.nix b/sys/machines/hopper/lab/navidrome/default.nix
index 55a32a4..f4f1c2a 100644
--- a/sys/machines/hopper/lab/navidrome/default.nix
+++ b/sys/machines/hopper/lab/navidrome/default.nix
@@ -3,7 +3,6 @@
   pkgs,
   ...
 }: {
-  users.groups.${config.services.navidrome.group}.members = ["caddy"]; # for caddy to access socket file
   services.navidrome = {
     enable = true;
     package = pkgs.navidrome.overrideAttrs {
@@ -12,7 +11,7 @@
     };
     settings = {
       MusicFolder = "/media/library/music";
-      Address = "unix:/var/lib/navidrome/navidrome.sock";
+      Address = config.vpnNamespaces."wg".bridgeAddress;
       EnableSharing = true;
     };
   };
diff --git a/sys/machines/hopper/lab/vpn-namespace.nix b/sys/machines/hopper/lab/vpn-namespace.nix
index a45b2f2..c0ec33d 100644
--- a/sys/machines/hopper/lab/vpn-namespace.nix
+++ b/sys/machines/hopper/lab/vpn-namespace.nix
@@ -10,6 +10,7 @@
       config.services.vaultwarden.config.ROCKET_PORT
       config.services.homepage-dashboard.listenPort
       config.services.audiobookshelf.port
+      config.services.navidrome.settings.Port
       8096 # jellyfin port
     ];
   in {