From cb66f2bb4c6e0bf18ec8f5d963c626214ca502cb Mon Sep 17 00:00:00 2001
From: Ricard Illa <ricard@trkkn.com>
Date: Tue, 18 Jan 2022 10:58:57 +0100
Subject: [PATCH] minor adjustmenets

---
 echidna.nix          | 2 +-
 home/mpd/common.nix  | 5 +++--
 home/mpd/default.nix | 5 +++--
 home/mpd/macos.nix   | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/echidna.nix b/echidna.nix
index 504d368..5256f1c 100644
--- a/echidna.nix
+++ b/echidna.nix
@@ -31,7 +31,7 @@ in {
 
   # Use a custom configuration.nix location.
   # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
-  # environment.darwinConfig = "$HOME/configs/nix/darwin-configuration.nix";
+  environment.darwinConfig = "/Users/rilla/configs/nix-config/echidna.nix";
 
   # Auto upgrade nix package and the daemon service.
   services.nix-daemon.enable = true;
diff --git a/home/mpd/common.nix b/home/mpd/common.nix
index 3065b44..70db247 100644
--- a/home/mpd/common.nix
+++ b/home/mpd/common.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 
-{
+let musicDir = "${config.home.homeDirectory}/Music";
+in {
   home.packages = [ pkgs.mpc_cli ];
 
   programs.ncmpcpp = {
@@ -21,7 +22,7 @@
       { key = "ctrl-u"; command = "page_up"; }
       { key = "ctrl-d"; command = "page_down"; }
     ];
-    mpdMusicDir = "${config.home.homeDirectory}/music";
+    mpdMusicDir = musicDir;
     settings = {
       autocenter_mode = "yes";
       follow_now_playing_lyrics = "yes";
diff --git a/home/mpd/default.nix b/home/mpd/default.nix
index b7d740f..7742f15 100644
--- a/home/mpd/default.nix
+++ b/home/mpd/default.nix
@@ -1,11 +1,12 @@
 { config, pkgs, ... }:
 
-{
+let musicDir = "${config.home.homeDirectory}/Music";
+in {
   imports = [ ./common.nix ];
   home.packages = [ pkgs.mpc_cli ];
   services.mpd = {
     enable = true;
-    musicDirectory = "${config.home.homeDirectory}/music";
+    musicDirectory = musicDir;
     network = {
       listenAddress = "any";
       port = 6600;
diff --git a/home/mpd/macos.nix b/home/mpd/macos.nix
index acf98c5..d92a4c6 100644
--- a/home/mpd/macos.nix
+++ b/home/mpd/macos.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  musicDir = "${config.home.homeDirectory}/shared/music";
+  musicDir = "${config.home.homeDirectory}/Music";
   mpdDir = "${config.home.homeDirectory}/.mpd";
 in {
   imports = [ ./common.nix ];