2 files changed, 28 insertions, 4 deletions

diff --git a/bragi.nix b/bragi.nix
index 03a42064..cbc04bf0 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -229,7 +229,7 @@ in rec {
   services.mpd = {
     enable = true;
     musicDirectory = "smb://odin.asgard.yggdrasil/media/music";
-    listenAddresses = [
+    network.listenAddresses = [
       { address = "any"; }
       "/var/lib/mpd/socket"
     ];
diff --git a/custom/mpd.nix b/custom/mpd.nix
index 8df2a955..fceb62fe 100644
--- a/custom/mpd.nix
+++ b/custom/mpd.nix
@@ -122,9 +122,33 @@ in {
         description = "Group account under which MPD runs.";
       };
 
-      listenAddresses = mkOption {
-        type = with types; listOf (either (submodule tcpAddress) str);
-        default = [{ address = "127.0.0.1"; }];
+      network = {
+
+        listenAddress = mkOption {
+          type = types.str;
+          default = "127.0.0.1";
+          example = "any";
+          description = ''
+            The address for the daemon to listen on.
+            Use <literal>any</literal> to listen on all addresses.
+          '';
+        };
+
+        port = mkOption {
+          type = types.int;
+          default = 6600;
+          description = ''
+            This setting is the TCP port that is desired for the daemon to get assigned
+            to.
+          '';
+        };
+
+
+        listenAddresses = mkOption {
+          type = with types; listOf (either (submodule tcpAddress) str);
+          default = [{ address = cfg.network.listenAddress; port = cfg.network.port; }];
+        };
+
       };
 
       dbFile = mkOption {