From 10df4a3b6d955f643823c9f3c023565378f0abb8 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sun, 3 Aug 2025 19:15:07 +0200 Subject: modules/sharky: Add stup option for `services.melisearch.settings` We use the unstable module that sets this options (behind a `lib.mkIf false`). They are not needed, but the module system needs them to exist. --- modules/by-name/sh/sharkey/module.nix | 61 +++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/modules/by-name/sh/sharkey/module.nix b/modules/by-name/sh/sharkey/module.nix index a296edd..155d658 100644 --- a/modules/by-name/sh/sharkey/module.nix +++ b/modules/by-name/sh/sharkey/module.nix @@ -13,38 +13,45 @@ in { "${nixpkgs-unstable}/nixos/modules/services/web-apps/sharkey.nix" ]; - options.vhack.sharkey = { - enable = lib.mkEnableOption "sharkey"; - - fqdn = lib.mkOption { - description = "The fully qualified domain name of this instance."; - type = lib.types.str; - example = "sharkey.shonk.social"; + options = { + services.meilisearch.settings = lib.mkOption { + type = lib.types.attrsOf lib.type.anything; + default = {}; }; - package = lib.mkOption { - type = lib.types.package; - default = pkgsUnstable.sharkey; - defaultText = lib.literalExpression "vhackPackages.sharkey"; - description = "Sharkey package to use."; - }; + vhack.sharkey = { + enable = lib.mkEnableOption "sharkey"; - mediaDirectory = lib.mkOption { - type = lib.types.path; - default = "/var/lib/sharkey"; - description = "The directory where sharkey stores it's data."; - }; + fqdn = lib.mkOption { + description = "The fully qualified domain name of this instance."; + type = lib.types.str; + example = "sharkey.shonk.social"; + }; - settings = lib.mkOption { - inherit (pkgs.formats.yaml {}) type; - default = {}; - description = '' - Extra Configuration for Sharkey, see - - for supported settings. + package = lib.mkOption { + type = lib.types.package; + default = pkgsUnstable.sharkey; + defaultText = lib.literalExpression "vhackPackages.sharkey"; + description = "Sharkey package to use."; + }; + + mediaDirectory = lib.mkOption { + type = lib.types.path; + default = "/var/lib/sharkey"; + description = "The directory where sharkey stores it's data."; + }; - Note, that this is applied on-top of the neccessary config. - ''; + settings = lib.mkOption { + inherit (pkgs.formats.yaml {}) type; + default = {}; + description = '' + Extra Configuration for Sharkey, see + + for supported settings. + + Note, that this is applied on-top of the neccessary config. + ''; + }; }; }; -- cgit 1.4.1