From 261c01478d05a2b97d12f7f1952781942a6748cd Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Mon, 9 Feb 2026 08:24:50 -0600 Subject: [PATCH] push --- main.nix | 2 +- modules/{fedi => }/config/invidious.yml | 0 modules/{fedi => }/config/searxng.yml | 0 modules/fedi/searxng.nix | 21 ------------ modules/searxng.nix | 44 +++++++++---------------- 5 files changed, 17 insertions(+), 50 deletions(-) rename modules/{fedi => }/config/invidious.yml (100%) rename modules/{fedi => }/config/searxng.yml (100%) delete mode 100755 modules/fedi/searxng.nix mode change 100644 => 100755 modules/searxng.nix diff --git a/main.nix b/main.nix index f040b1f..6eab266 100644 --- a/main.nix +++ b/main.nix @@ -13,7 +13,7 @@ ./modules/mailserver.nix ./modules/vscode-server.nix ./modules/copyparty.nix - ./modules/fedi/searxng.nix + ./modules/searxng.nix ./modules/cloudflared.nix ./modules/invidious.nix diff --git a/modules/fedi/config/invidious.yml b/modules/config/invidious.yml similarity index 100% rename from modules/fedi/config/invidious.yml rename to modules/config/invidious.yml diff --git a/modules/fedi/config/searxng.yml b/modules/config/searxng.yml similarity index 100% rename from modules/fedi/config/searxng.yml rename to modules/config/searxng.yml diff --git a/modules/fedi/searxng.nix b/modules/fedi/searxng.nix deleted file mode 100755 index 335c915..0000000 --- a/modules/fedi/searxng.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - # remove sops dependency from searxng module - systemd.services.searx-init.serviceConfig.EnvironmentFile = [ - "/home/bug/nix/modules/fedi/searxng_key" - ]; - - services.searx = { - enable = true; - redisCreateLocally = false; - configureUwsgi = false; - settingsFile = config/searxng.yml; - environmentFile = "/home/bug/nix/modules/fedi/searxng_key"; - settings = { - server.port = 8888; - server.bind_address = "0.0.0.0"; - server.secret_key = "$SEARX_SECRET_KEY"; - }; - }; -} diff --git a/modules/searxng.nix b/modules/searxng.nix old mode 100644 new mode 100755 index a445935..9ed2291 --- a/modules/searxng.nix +++ b/modules/searxng.nix @@ -1,33 +1,21 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { - services.searx = { - enable = true; + systemd.services.searx-init.serviceConfig.EnvironmentFile = [ + "/home/bug/.searxng.env" + ]; + + services.searx = { + enable = true; + redisCreateLocally = false; + configureUwsgi = false; + settingsFile = config/searxng.yml; + environmentFile = "/home/bug/.searxng.env"; - environmentFile = "/home/bug/nix/modules/searxng_key"; - redisCreateLocally = true; - - settings = { - server = { - bind_address = "127.0.0.1"; - port = 1025; - secret_key = "test"; - }; - - general = { - instance_name = "search.bug.tools"; - }; - - engines = { - remove = [ - "ahmia" - "torch" - "radio_browser" - "wikidata" - ]; - }; - - limiter.enable = false; - }; + settings = { + server.port = 1025; + server.bind_address = "0.0.0.0"; + server.secret_key = "$SEARX_SECRET_KEY"; }; + }; } \ No newline at end of file