From 540fb33950039f8068cc95ee32f0c8fdfc72d7b8 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Fri, 24 Oct 2025 12:49:39 -0400
Subject: [PATCH] fix searx, rm ooye

---
 clients/quadraticserver/matrix/bridges.nix | 47 ++++++++++------------
 clients/quadraticserver/searxng.nix        |  5 +--
 2 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/clients/quadraticserver/matrix/bridges.nix b/clients/quadraticserver/matrix/bridges.nix
index d582fab..18ca084 100644
--- a/clients/quadraticserver/matrix/bridges.nix
+++ b/clients/quadraticserver/matrix/bridges.nix
@@ -32,37 +32,32 @@ in
 {
   imports = [
     inputs.nix-matrix-appservices.nixosModule
-    inputs.ooye.modules.default
   ];
 
-  services =
-    let
-      domain = "ooye.federated.nexus";
-    in
-    {
-      matrix-appservices.services.gmessages = {
-        host = "127.0.0.5";
-        serviceConfig.EnvironmentFile = config.age.secrets."gmessages.age".path;
-        format = "mautrix-go";
-        port = 8000;
-        package = pkgs.mautrix-gmessages.override { withGoolm = true; };
-        settings = settings // {
-          appservice = {
-            as_token = "$CUSTOM_AS_TOKEN";
-            hs_token = "$CUSTOM_HS_TOKEN";
-          };
+  services = {
+    matrix-appservices.services.gmessages = {
+      host = "127.0.0.5";
+      serviceConfig.EnvironmentFile = config.age.secrets."gmessages.age".path;
+      format = "mautrix-go";
+      port = 8000;
+      package = pkgs.mautrix-gmessages.override { withGoolm = true; };
+      settings = settings // {
+        appservice = {
+          as_token = "$CUSTOM_AS_TOKEN";
+          hs_token = "$CUSTOM_HS_TOKEN";
         };
       };
-
-      mautrix-whatsapp = {
-        enable = false;
-        package = pkgs.mautrix-whatsapp.override { withGoolm = true; };
-        settings = settings // {
-          appservice.hostname = "127.0.0.4";
-        };
-        environmentFile = config.age.secrets."whatsapp.age".path;
-      };
     };
 
+    mautrix-whatsapp = {
+      enable = false;
+      package = pkgs.mautrix-whatsapp.override { withGoolm = true; };
+      settings = settings // {
+        appservice.hostname = "127.0.0.4";
+      };
+      environmentFile = config.age.secrets."whatsapp.age".path;
+    };
+  };
+
   systemd.services.matrix-ooye.serviceConfig.Restart = lib.mkForce "always";
 }
diff --git a/clients/quadraticserver/searxng.nix b/clients/quadraticserver/searxng.nix
index c63a6d4..fe06d9e 100644
--- a/clients/quadraticserver/searxng.nix
+++ b/clients/quadraticserver/searxng.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ lib, ... }:
 {
   services =
     let
@@ -8,9 +8,6 @@
     {
       searx = {
         enable = true;
-        package = pkgs.searxng.overrideAttrs {
-          patches = [ ./google.patch ];
-        };
         settings =
           let
             enginesByCategory = {