tmp

flake.lock

@@ -298,11 +298,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717670534,
-        "narHash": "sha256-pzkVew3wK8RIa8tQMzU3kd8Cf+u9g1XDfNpBT+k5lyo=",
+        "lastModified": 1715947901,
+        "narHash": "sha256-nAcmnm4/PBA+E3kjtLZJy7aKmzu4Ou5dzVFAC0j9ORM=",
         "owner": "chayleaf",
         "repo": "nixpkgs",
-        "rev": "b4313b98b86d588375cdad46f75279b7aa45bd41",
+        "rev": "8620504340e055daa4f81b43117e55952c8b7a87",
         "type": "github"
       },
       "original": {

pkgs/default.nix

@@ -26,26 +26,6 @@ in
     stable = nixForNixPlugins;
     unstable = nixForNixPlugins;
   };
-  matrix-appservice-discord = pkgs.matrix-appservice-discord.overrideAttrs (old: {
-    patches = (old.patches or []) ++ [
-      (pkgs.fetchpatch {
-        url = "https://github.com/matrix-org/matrix-appservice-discord/commit/eb989fa710e8db4ebc8f2ce36c6679ee6cbc1a44.patch";
-        hash = "sha256-GPeFDw3XujqXHJveHSsBHwHuG51vad50p55FX1Esq58=";
-      })
-      (pkgs.fetchpatch {
-        url = "https://github.com/matrix-org/matrix-appservice-discord/commit/a4cd5e3a6a2d544adac2a263e164671c8a9009d9.patch";
-        hash = "sha256-qQJ4V6/Ns2Msu8+X8JoEycuQ2Jc90TXulsuLLmPecGU=";
-      })
-      (pkgs.fetchpatch {
-        url = "https://github.com/matrix-org/matrix-appservice-discord/commit/fc850ba2473973e28858449ec4020380470d78b2.patch";
-        hash = "sha256-Lq0FWmR08wLsoq4APRTokZzb7U2po98pgyxH4UR/9/M=";
-      })
-      (pkgs.fetchpatch {
-        url = "https://github.com/matrix-org/matrix-appservice-discord/commit/7f3d41d86ebce057cfdc82ce3aaab64b533e8f0b.patch";
-        hash = "sha256-HmQ1KASZS+a78fe5yOCVXAnXLRmJUglzc6OxNJazOSk=";
-      })
-    ];
-  });
   # Various patches to change Nix version of existing packages so they don't error out because of nix-plugins in nix.conf
   /*nix-plugins = (pkgs.nix-plugins.override { nix = nixForNixPlugins; }).overrideAttrs (old: {
     version = "13.0.0";

system/hosts/router/default.nix

@@ -483,7 +483,7 @@ in {
       { ipv6 = true; extraArgs = [ "fwmark" wan_table "table" wan_table ]; }
       # below is dnat config
     ] ++ builtins.concatLists (map (rule: let
-      table = if rule.inVpn then vpn_table else wan_table;
+      table = if rule.inVpn then 0 else wan_table;
       forEachPort = func: port:
         if builtins.isInt port then [ (func port) ]
         else if port?set then builtins.concatLists (map (forEachPort func) port.set)
@@ -894,12 +894,10 @@ in {
     # fetch vpn_ips.json and vpn_domains.json for unbound
     script = ''
       BLACKLIST=$(${pkgs.coreutils}/bin/mktemp) || exit 1
-      ${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v3/ips/" -o "$BLACKLIST" || exit 1
+      ${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v2/ips/json/" -o "$BLACKLIST" || exit 1
       ${pkgs.jq}/bin/jq ".[0:0]" "$BLACKLIST" && chown unbound:unbound "$BLACKLIST" && mv "$BLACKLIST" /var/lib/unbound/vpn_ips.json
-      ${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v3/domains/" -o "$BLACKLIST" || exit 1
+      ${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v2/domains/json/" -o "$BLACKLIST" || exit 1
       ${pkgs.jq}/bin/jq ".[0:0]" "$BLACKLIST" && chown unbound:unbound "$BLACKLIST" && mv "$BLACKLIST" /var/lib/unbound/vpn_domains.json
-      ${pkgs.curl}/bin/curl "https://reestr.rublacklist.net/api/v3/dpi/" -o "$BLACKLIST" || exit 1
-      ${pkgs.jq}/bin/jq ".[0:0]" "$BLACKLIST" && chown unbound:unbound "$BLACKLIST" && mv "$BLACKLIST" /var/lib/unbound/vpn_dpi.json
     '';
     serviceConfig = {
       Type = "oneshot";

system/hosts/server/certspotter.py

@@ -37,14 +37,14 @@ def main() -> None:
     spot.add_argument("--domain", "-d", type=str, required=True)
     spot.add_argument("--cache_file", "-c", type=str, required=True)
     spot.add_argument("certs", type=str, nargs="*")
-    tbs = subparsers.add_parser("tbs")
-    tbs.set_defaults(func=print_tbs)
-    tbs.add_argument("path", type=str)
+    hash = subparsers.add_parser("hash")
+    hash.set_defaults(func=print_hash)
+    hash.add_argument("path", type=str)
     args = parser.parse_args()
     args.func(args)
 
 
-def print_tbs(args) -> None:
+def print_hash(args) -> None:
     with open(args.path, "rb") as f:
         print(calc_tbs(f.read()))
 

system/hosts/server/home.nix

@@ -107,11 +107,14 @@ in {
   # make sure only hydra has access to this file
   # so normal nix evals don't have access to builtins
   nix.settings.extra-builtins-file = "/secrets/nixos/extra-builtins.nix";
-  # required for hydra which uses restricted mode
   nix.settings.allowed-uris = [
-    "https://git.sr.ht/"
-    "https://api.github.com/repos/"
-    "https://github.com/"
+    # required for home-manager (no idea if it's required at this point)
+    "https://git.sr.ht/~rycee/nmd/"
+    # ...for the rest of the home config
+    "https://api.github.com/repos/FAForever/"
+    "https://github.com/nix-community/nix-index-database/releases/download/"
+    # required for server (I suppose since nvfetcher uses fetchTarball here...)
+    "https://github.com/searxng/searxng/"
     # for nginx CF-Connecting-IP config generation
     "https://www.cloudflare.com/ips-v4"
     "https://www.cloudflare.com/ips-v6"
@@ -280,7 +283,7 @@ in {
         job_name = "local_medium_freq";
         scrape_interval = "15m";
         static_configs = [ {
-          targets = [ "127.0.0.1:9548" "127.0.0.1:9198" "127.0.0.1:9173" ];
+          targets = [ "127.0.0.1:9548" "127.0.0.1:9198" ];
           labels.machine = "server";
         } ];
       }
@@ -356,12 +359,6 @@ in {
       }
     ];
   };
-  # TODO: enable
-  services.matrix-appservice-discord.settings.metrics = {
-    enable = true;
-    host = "127.0.0.1";
-    port = 9173;
-  };
   services.matrix-synapse.settings = {
     enable_metrics = true;
     federation_metrics_domains = [ "matrix.org" ];

system/hosts/server/keycloak.nix

@@ -36,8 +36,7 @@ in {
 
   # a crude way to make some python packages available for synapse
   services.matrix-synapse.plugins = with pkgs.python3.pkgs; [ authlib ];
-  # i'm managing this manually in a stateful way
-  # services.matrix-synapse.settings.password_config.enabled = false;
+  services.matrix-synapse.settings.password_config.enabled = false;
   systemd.services.matrix-synapse.after = [ "keycloak.service" ];
 
   # See also https://meta.akkoma.dev/t/390

system/hosts/server/matrix.nix

@@ -1,6 +1,5 @@
 { config
 , lib
-, pkgs
 , ... }:
 
 let
@@ -52,32 +51,12 @@ in {
     homeserver = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}/";
   };
 
-  services.matrix-appservice-discord = {
-    enable = true;
-    environmentFile = "/secrets/discord-bridge-token";
-    settings = {
-      auth.usePrivilegedIntents = true;
-      database.filename = "";
-      bridge = {
-        domain = "matrix.${cfg.domainName}";
-        homeserverUrl = "https://matrix.${cfg.domainName}";
-        enableSelfServiceBridging = true;
-        disablePresence = true;
-        disablePortalBridging = true;
-        disableInviteNotifications = true;
-        disableJoinLeaveNotifications = true;
-        disableRoomTopicNotifications = true;
-      };
-    };
-  };
-
   services.matrix-synapse = {
     enable = true;
     extraConfigFiles = [ "/var/lib/matrix-synapse/config.yaml" ];
     settings = {
       app_service_config_files = [
         "/var/lib/heisenbridge/registration.yml"
-        "/var/lib/matrix-synapse/discord-registration.yaml"
       ];
       allow_guest_access = true;
       url_preview_enabled = true;

system/hosts/server/maubot.nix

@@ -30,6 +30,5 @@ in {
   ];
   services.maubot.pythonPackages = with pkgs.python3.pkgs; [
     levenshtein
-    pillow
   ];
 }