From 7631786fee8cc7c8f39d4e58ae71c52b14332ef0 Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 23 Dec 2025 17:40:35 +0000 Subject: [PATCH] flake/lib/mkServiceOption: kill extraConfig --- modules/flake/lib/services.nix | 4 +--- modules/nixos/services/nixpkgs-prs-bot.nix | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/flake/lib/services.nix b/modules/flake/lib/services.nix index 3f00f2dc..5bdafbdf 100644 --- a/modules/flake/lib/services.nix +++ b/modules/flake/lib/services.nix @@ -29,7 +29,6 @@ let port ? 0, host ? "127.0.0.1", domain ? "", - extraConfig ? { }, }: { enable = mkEnableOption "Enable the ${name} service"; @@ -52,8 +51,7 @@ let defaultText = "networking.domain"; description = "Domain name for the ${name} service"; }; - } - // extraConfig; + }; in { inherit mkGraphicalService mkServiceOption; diff --git a/modules/nixos/services/nixpkgs-prs-bot.nix b/modules/nixos/services/nixpkgs-prs-bot.nix index 3a401256..b08273e3 100644 --- a/modules/nixos/services/nixpkgs-prs-bot.nix +++ b/modules/nixos/services/nixpkgs-prs-bot.nix @@ -11,11 +11,9 @@ let cfg = config.garden.services.nixpkgs-prs-bot; in { - options.garden.services.nixpkgs-prs-bot = mkServiceOption "nixpkgs-prs-bot" { - extraConfig = { - fedi.enable = mkEnableOption "fedi"; - bsky.enable = mkEnableOption "bsky"; - }; + options.garden.services.nixpkgs-prs-bot = mkServiceOption "nixpkgs-prs-bot" { } // { + fedi.enable = mkEnableOption "fedi"; + bsky.enable = mkEnableOption "bsky"; }; config = mkIf cfg.enable (mkMerge [ -- 2.51.2