Refactor music module

4 files changed, 18 insertions, 14 deletions

diff --git a/home.nix b/home.nix
index 54374fb..624614e 100644
--- a/home.nix
+++ b/home.nix
@@ -7,9 +7,8 @@ in
     ./overlays-home.nix
     ./modules/git.home.nix
     ./modules/mpv.home.nix
-    ./modules/music.home/default.nix
+    ./modules/music/default.home.nix
     ./modules/xresources.home.nix
-    # ./modules/firefox.home/default.nix
     ./modules/newsboat.home/default.nix
     ./modules/email.home/default.nix
     ./modules/calendar.home/default.nix
diff --git a/modules/music.home/.gitignore b/modules/music/.gitignore
index febbc25..febbc25 100644
--- a/modules/music.home/.gitignore
+++ b/modules/music/.gitignore
diff --git a/modules/music/config.nix b/modules/music/config.nix
new file mode 100644
index 0000000..3e02957
--- /dev/null
+++ b/modules/music/config.nix
@@ -0,0 +1,10 @@
+{ config, ... } :
+{
+  mopidyHttpPort = 6680;
+  mpd = {
+    host = "127.0.0.1";
+    port = 6600;
+    musicDir = "${config.home.homeDirectory}/Downloads/music";
+    playlistDir = "${config.home.homeDirectory}/Downloads/music/playlist";
+  };
+}
diff --git a/modules/music.home/default.nix b/modules/music/default.home.nix
index d220646..10c91bc 100644
--- a/modules/music.home/default.nix
+++ b/modules/music/default.home.nix
@@ -1,11 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, ... }@moduleAttrs:
 let
-  mpd = {
-    host = "127.0.0.1";
-    port = 6600;
-    musicDir = "${config.home.homeDirectory}/Downloads/music";
-    playlistDir = "${config.home.homeDirectory}/Downloads/music/playlist";
-  };
+  cfg = import ./config.nix moduleAttrs;
 in
 {
   home.packages = with pkgs; [ mpc_cli playerctl ];
@@ -25,12 +20,12 @@ in
       };
       file = {
         enabled = true;
-        media_dirs = [ mpd.musicDir ];
+        media_dirs = [ cfg.mpd.musicDir ];
         show_dotfiles = false;
       };
       m3u = {
         enabled = true;
-        playlists_dir = mpd.playlistDir;
+        playlists_dir = cfg.mpd.playlistDir;
       };
       audio = {
         mixer = "software";
@@ -42,15 +37,15 @@ in
       };
       mpd = {
         enabled = true;
-        hostname = mpd.host;
-        port = mpd.port;
+        hostname = cfg.mpd.host;
+        port = cfg.mpd.port;
         max_connections = 20;
         connection_timeout = 60;
       };
       http = {
         enabled = true;
         hostname = "0.0.0.0";
-        port = 6680;
+        port = cfg.mopidyHttpPort;
         default_app = "iris";
       };
       softwaremixer.enabled = true;