fixup! mpd: use XDG music directory

DanNixon · Jun 23, 2024 · dd2e681 · dd2e681
1 parent 15669a4
commit dd2e681
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;