diff --git a/modules/tinyproxy.nix b/modules/tinyproxy.nix index 3a6296c..a09e41e 100644 --- a/modules/tinyproxy.nix +++ b/modules/tinyproxy.nix @@ -4,7 +4,7 @@ with lib; let - cfg = config.services.tinyproxy; + cfg = config.shb.tinyproxy; mkValueStringTinyproxy = with lib; v: if true == v then "yes" @@ -99,7 +99,7 @@ in }; in { - services.tinyproxy = mkOption { + shb.tinyproxy = mkOption { description = "Tinyproxy instances."; default = {}; type = types.attrsOf instanceOption; diff --git a/modules/vpn.nix b/modules/vpn.nix index 7803e72..19e2b93 100644 --- a/modules/vpn.nix +++ b/modules/vpn.nix @@ -293,7 +293,7 @@ in networking.iproute2.rttablesExtraConfig = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: c: "${toString c.routingNumber} ${name}") cfg); - services.tinyproxy = + shb.tinyproxy = let instanceConfig = name: c: lib.mkIf (c.enable && c.proxyPort != null) { ${name} = {