From 1f3d7707614ecba4fa4314ace652ef21a1adfce6 Mon Sep 17 00:00:00 2001 From: Shelvacu Date: Fri, 27 Sep 2024 21:06:43 -0700 Subject: [PATCH] stuff --- common/nixos.nix | 1 + flake.nix | 5 ++++- triple-dezert/haproxy-config.cfg | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/common/nixos.nix b/common/nixos.nix index e5de70e..abf9c1c 100644 --- a/common/nixos.nix +++ b/common/nixos.nix @@ -40,6 +40,7 @@ # the security warning might as well have said "its insecure maybe but there's nothing you can do about it" # presumably needed by nheko nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + nixpkgs.overlays = [ inputs.self.overlays.default ]; console = { keyMap = lib.mkDefault "us"; diff --git a/flake.nix b/flake.nix index c6ae326..0205f99 100644 --- a/flake.nix +++ b/flake.nix @@ -93,7 +93,6 @@ self, nixpkgs, nix-on-droid, - home-manager, ... }@inputs: let @@ -124,6 +123,10 @@ nixpkgs = ({ revCount = 0; } // inputs.nixpkgs); } ); + overlays.requireFileSub = (curr: prev: { + requireFile = { ... }@args: (prev args).overrideAttrs { allowSubstitutes = true; }; + }); + overlays.default = self.overlays.requireFileSub; nixosConfigurations = { triple-dezert = mkNixosConfig { module = ./triple-dezert; diff --git a/triple-dezert/haproxy-config.cfg b/triple-dezert/haproxy-config.cfg index 4a885a0..fc416b5 100644 --- a/triple-dezert/haproxy-config.cfg +++ b/triple-dezert/haproxy-config.cfg @@ -13,8 +13,8 @@ global defaults # https://world.hey.com/goekesmi/haproxy-chrome-tcp-preconnect-and-error-408-a-post-preserved-from-the-past-2497d1f7 - timeout server 3s - timeout client 3s + timeout server 30s + timeout client 10s timeout connect 10s option http-ignore-probes