From 2c095bfbc5ecbd2d43f96c0dee736d5883937d22 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Sun, 14 Jan 2024 16:09:55 -0500
Subject: [PATCH] fix(docker): get correct path for volume data

---
 devices/servivi/modules/arion/default.nix             | 7 +++++--
 devices/servivi/modules/arion/music/jbots/compose.nix | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/devices/servivi/modules/arion/default.nix b/devices/servivi/modules/arion/default.nix
index a5c11ae..7ca208d 100644
--- a/devices/servivi/modules/arion/default.nix
+++ b/devices/servivi/modules/arion/default.nix
@@ -3,6 +3,7 @@
   config,
   lib,
   pkgs,
+  self,
   ...
 } @ inputs:
 with lib;
@@ -57,9 +58,11 @@ in {
       backend = "docker";
 
       projects = let
+        basePath = "${self}/devices/${config.vars.hostName}/modules/arion";
+
         composeFiles =
           filter (n: hasSuffix "compose.nix" (toString n))
-          (filesystem.listFilesRecursive ./.);
+          (filesystem.listFilesRecursive basePath);
 
         projects = filterAttrs (n: v: v.enabled or true) (listToAttrs (map (p: {
             name = elemAt (match ".*\/(.*)\/compose\.nix" (toString p)) 0;
@@ -70,7 +73,7 @@ in {
                 rwPath =
                   configPath
                   + "/"
-                  + elemAt (match "[^-]*-(.*)" "${dirOf p}") 0;
+                  + removePrefix basePath "${dirOf p}";
               });
           })
           composeFiles));
diff --git a/devices/servivi/modules/arion/music/jbots/compose.nix b/devices/servivi/modules/arion/music/jbots/compose.nix
index 1e7eff4..0199cb6 100644
--- a/devices/servivi/modules/arion/music/jbots/compose.nix
+++ b/devices/servivi/modules/arion/music/jbots/compose.nix
@@ -10,8 +10,8 @@
       restart = "always";
 
       volumes = [
-        "${rwPath}/data/be/config.txt:/app/config.txt:ro"
-        "${rwPath}/data/be/playlists:/app/playlists:rw"
+        "${rwPath}/be/config.txt:/app/config.txt:ro"
+        "${rwPath}/be/playlists:/app/playlists:rw"
       ];
     };
 
@@ -21,8 +21,8 @@
       restart = "always";
 
       volumes = [
-        "${rwPath}/data/br/config.txt:/app/config.txt:ro"
-        "${rwPath}/data/br/playlists:/app/playlists:rw"
+        "${rwPath}/br/config.txt:/app/config.txt:ro"
+        "${rwPath}/br/playlists:/app/playlists:rw"
       ];
     };
   };