diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix
index ca1cd6ca43af..c986692076ad 100644
--- a/nixos/modules/services/audio/navidrome.nix
+++ b/nixos/modules/services/audio/navidrome.nix
@@ -6,8 +6,18 @@
 }:
 
 let
-  inherit (lib) mkEnableOption mkPackageOption mkOption maintainers;
-  inherit (lib.types) bool str;
+  inherit (lib)
+    mkEnableOption
+    mkPackageOption
+    mkOption
+    maintainers
+    ;
+  inherit (lib.types)
+    bool
+    port
+    str
+    submodule
+    ;
   cfg = config.services.navidrome;
   settingsFormat = pkgs.formats.json { };
 in
@@ -20,10 +30,22 @@ in
       package = mkPackageOption pkgs "navidrome" { };
 
       settings = mkOption {
-        type = settingsFormat.type;
-        default = {
-          Address = "127.0.0.1";
-          Port = 4533;
+        type = submodule {
+          freeformType = settingsFormat.type;
+
+          options = {
+            Address = mkOption {
+              default = "127.0.0.1";
+              description = "Address to run Navidrome on.";
+              type = str;
+            };
+
+            Port = mkOption {
+              default = 4533;
+              description = "Port to run Navidrome on.";
+              type = port;
+            };
+          };
         };
         example = {
           MusicFolder = "/mnt/music";
@@ -134,5 +156,5 @@ in
 
       networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.Port ];
     };
-    meta.maintainers = with maintainers; [ nu-nu-ko ];
+  meta.maintainers = with maintainers; [ nu-nu-ko ];
 }