Unverified Commit 5abcff7a authored by éclairevoyant's avatar éclairevoyant
Browse files

nixos/komga: fix settings option and default 

Use freeform submodule to make default visible in search and
prevent the warning about the old option format being used.
See https://github.com/NixOS/nixpkgs/pull/345594#issuecomment-2506816155
parent 2fdec2c2

nixos/modules/services/web-apps/komga.nix

+15 −13
Original line number Diff line number Diff line
@@ -8,7 +8,12 @@ 
let

  cfg = config.services.komga;

  inherit (lib) mkOption mkEnableOption maintainers;

  inherit (lib.types) port str bool;

  inherit (lib.types)

    port

    str

    bool

    submodule

    ;



  settingsFormat = pkgs.formats.yaml { };

in
@@ -53,13 +58,14 @@ in 
      };



      settings = lib.mkOption {

        inherit (settingsFormat) type;

        default = { };

        defaultText = lib.literalExpression ''

          {

            server.port = 8080;

          }

        '';

        type = submodule {

          freeformType = settingsFormat.type;

          options.server.port = mkOption {

            type = port;

            description = "The port that Komga will listen on.";

            default = 8080;

          };

        };

        description = ''

          Komga configuration.
@@ -87,11 +93,7 @@ in 
        }

      ];



      services.komga.settings = {

        server.port = lib.mkDefault 8080;

      };



      networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];

      networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.server.port ];



      users.groups = mkIf (cfg.group == "komga") { komga = { }; };