4 files changed, 24 insertions, 5 deletions
diff --git a/modules/home.legacy/conf/beets/default.nix b/modules/home.legacy/conf/beets/default.nix
index 612a5f03..2fec6881 100644
--- a/modules/home.legacy/conf/beets/default.nix
+++ b/modules/home.legacy/conf/beets/default.nix
@@ -42,7 +42,7 @@ in {
       };
 
       replace = {
-        "[/]" = "\\";
+        "[/]" = "\\\\";
         "[\\x00-\\x1f]" = "";
         "\\s+$" = "";
         "^\\s+" = "";
@@ -67,9 +67,19 @@ in {
       paths = let
         join = lib.strings.concatStringsSep "/";
       in {
-        "albumtype:live" = join ["[Live, please delete]" "$genre" "$first_artist" "$album ($albumtype)" "$track $title"];
-
-        default = "$albumartist/$album%aunique{}/$track $title";
+        "albumtype:live" = join [
+          "[Live, please delete]"
+          "$genre"
+          "$primary_artist" # (= $albumartists[0]). From inline plugin
+          "$album ($albumtype)"
+          "$track $title"
+        ];
+
+        default = join [
+          "$primary_artist" # (= $albumartists[0]). From inline plugin
+          "$album%aunique{}"
+          "$track $title"
+        ];
       };
 
       inherit plugins;
diff --git a/modules/home.legacy/conf/beets/plugins.nix b/modules/home.legacy/conf/beets/plugins.nix
index a3abb580..ed78b49e 100644
--- a/modules/home.legacy/conf/beets/plugins.nix
+++ b/modules/home.legacy/conf/beets/plugins.nix
@@ -35,6 +35,8 @@
   # `mpdupgate` can propagate changed playlist to `mpd`.
   "smartplaylist"
 
+  "inline"
+
   # Warn, when importing a matching item
   "ihate"
 
diff --git a/modules/home.legacy/conf/beets/plugins/default.nix b/modules/home.legacy/conf/beets/plugins/default.nix
index ddba95e0..d22369be 100644
--- a/modules/home.legacy/conf/beets/plugins/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/default.nix
@@ -12,6 +12,7 @@
     ./badfiles
     ./duplicates
     ./ihate
+    ./inline
     ./lyrics
     ./replaygain
     ./smartplaylist
diff --git a/modules/home.legacy/conf/iamb/default.nix b/modules/home.legacy/conf/beets/plugins/inline/default.nix
index 764e2efc..564d5b4c 100644
--- a/modules/home.legacy/conf/iamb/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/inline/default.nix
@@ -8,5 +8,11 @@
 # You should have received a copy of the License along with this program.
 # If not, see <https://www.gnu.org/licenses/gpl-3.0.txt>.
 {...}: {
-  xdg.configFile."iamb/config.json".source = ./config.json;
+  programs.beets.settings.item_fields = {
+    primary_artist =
+      # python
+      ''
+        albumartists[0]
+      '';
+  };
 }