From dd2e681f8c68273ad15c8695365f67151090339c Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Sun, 23 Jun 2024 06:52:30 +0100
Subject: [PATCH] fixup! mpd: use XDG music directory

---
 configurations/akane/home-manager/default.nix        | 7 ++++++-
 configurations/hina/home-manager/default.nix         | 2 --
 configurations/maya/home-manager/default.nix         | 7 ++++++-
 modules/home-manager/desktop_environment/default.nix | 3 ++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/configurations/akane/home-manager/default.nix b/configurations/akane/home-manager/default.nix
index b582f58..66537af 100644
--- a/configurations/akane/home-manager/default.nix
+++ b/configurations/akane/home-manager/default.nix
@@ -20,7 +20,11 @@ in
       ../../../modules/home-manager/media.nix
       ../../../modules/home-manager/office.nix
 
-      ({pkgs, ...}: rec {
+      ({
+        config,
+        pkgs,
+        ...
+      }: rec {
         home.packages = with pkgs; [
           lightburn
           scrcpy
@@ -35,6 +39,7 @@ in
           "com.adobe.Flash-Player-Projector"
         ];
 
+        xdg.userDirs.music = "${config.home.homeDirectory}/music";
         services.mpd.enable = true;
 
         programs.borgmatic.backups."main" = {
diff --git a/configurations/hina/home-manager/default.nix b/configurations/hina/home-manager/default.nix
index 592bee0..9033100 100644
--- a/configurations/hina/home-manager/default.nix
+++ b/configurations/hina/home-manager/default.nix
@@ -35,8 +35,6 @@ in
           "com.adobe.Flash-Player-Projector"
         ];
 
-        services.mpd.enable = true;
-
         programs.borgmatic.backups."main" = {
           location = {
             sourceDirectories = [
diff --git a/configurations/maya/home-manager/default.nix b/configurations/maya/home-manager/default.nix
index 9ae8a74..517dd81 100644
--- a/configurations/maya/home-manager/default.nix
+++ b/configurations/maya/home-manager/default.nix
@@ -20,7 +20,11 @@ in
       ../../../modules/home-manager/media.nix
       ../../../modules/home-manager/office.nix
 
-      ({pkgs, ...}: rec {
+      ({
+        config,
+        pkgs,
+        ...
+      }: rec {
         home.packages = with pkgs; [
           nur.repos.DanNixon.metty
           nur.repos.DanNixon.satorictl-unstable
@@ -33,6 +37,7 @@ in
           "com.valvesoftware.Steam"
         ];
 
+        xdg.userDirs.music = "${config.home.homeDirectory}/music";
         services.mpd.enable = true;
 
         programs.borgmatic.backups."main" = {
diff --git a/modules/home-manager/desktop_environment/default.nix b/modules/home-manager/desktop_environment/default.nix
index 7d9bf15..6ebbaf3 100644
--- a/modules/home-manager/desktop_environment/default.nix
+++ b/modules/home-manager/desktop_environment/default.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   config,
   pkgs,
   ...
@@ -40,7 +41,7 @@
       desktop = null;
       documents = "${config.home.homeDirectory}/documents";
       download = "${config.home.homeDirectory}/downloads";
-      music = "${config.home.homeDirectory}/music";
+      music = lib.mkDefault null;
       pictures = null;
       publicShare = null;
       templates = null;