diff --git a/machines/gerd/services/lldap/default.nix b/machines/gerd/services/lldap/default.nix index 03bc1f8..dd36177 100644 --- a/machines/gerd/services/lldap/default.nix +++ b/machines/gerd/services/lldap/default.nix @@ -281,7 +281,7 @@ in { mail = mkProvisionEmail name; groups = with lconfig.groups; [ admin nextcloud_admin grafana_admin drasl_admin member ]; membermaildiskquota = 100*1024*1024; # mb - nextcloudquota = 500*1024*1024; # mb + nextcloudquota = 100*1024*1024; # mb }); }; diff --git a/machines/gerd/services/searx.nix b/machines/gerd/services/searx.nix index eb3b1de..c3c8091 100644 --- a/machines/gerd/services/searx.nix +++ b/machines/gerd/services/searx.nix @@ -1,15 +1,9 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: let svc_domain = "searx.${config.mine.shared.settings.domain}"; port = 7378; -in -{ +in { services.searx = { enable = true; runInUwsgi = true; @@ -24,13 +18,6 @@ in base_url = "https://${svc_domain}"; secret_key = "@SECRET_KEY@"; }; - - search.formats = [ - "html" - "json" - "rss" - "csv" - ]; }; }; @@ -38,7 +25,7 @@ in services.nginx.virtualHosts."${svc_domain}" = config.mine.shared.lib.authelia.mkProtectedWebsite { forceSSL = true; enableACME = true; - + locations."/" = config.mine.shared.lib.authelia.mkProtectedLocation { proxyPass = "http://localhost:${builtins.toString port}"; }; @@ -50,14 +37,12 @@ in description = "We host our own searXNG, use it to search the web!"; url = "https://${svc_domain}"; - package = - let - pkg = config.services.searx.package; - in - { - name = pkg.pname; - version = pkg.version; - meta = pkg.meta; - }; + package = let + pkg = config.services.searx.package; + in { + name = pkg.pname; + version = pkg.version; + meta = pkg.meta; + }; }; } diff --git a/shared/sources/sources.json b/shared/sources/sources.json index b39a8f6..e5d6000 100644 --- a/shared/sources/sources.json +++ b/shared/sources/sources.json @@ -36,10 +36,10 @@ "homepage": null, "owner": "RasmusRendal", "repo": "drtvrss", - "rev": "6785b019639b6ea32857761100fe88ecab640d4a", - "sha256": "1m8srjvhi5z12wbdldhqmxw289g9mnfmb2wvfimbgx5frm5vf1pk", + "rev": "dc0900835a5ed723c6e53d2c408ba7d51ef27bb9", + "sha256": "0k450i7fl4l0avmdz2dzdrmharypajq3qmyj4xsc6xvgi23nfrb0", "type": "tarball", - "url": "https://github.com/RasmusRendal/drtvrss/archive/6785b019639b6ea32857761100fe88ecab640d4a.tar.gz", + "url": "https://github.com/RasmusRendal/drtvrss/archive/dc0900835a5ed723c6e53d2c408ba7d51ef27bb9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "flake-compat": {