From af9b4d632471ce720bbb88767f50898d39522f3d Mon Sep 17 00:00:00 2001 From: arcnmx Date: Sat, 12 Aug 2023 10:59:33 -0700 Subject: [PATCH] flake update --- flake.lock | 30 +++++++++++++++--------------- overlays/local/default.nix | 5 ----- tewi/access.nix | 2 +- tewi/home-assistant.nix | 8 -------- tewi/kanidm.nix | 2 +- 5 files changed, 17 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index ef0de6bb..8c1f4eac 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "arcexprs": { "flake": false, "locked": { - "lastModified": 1689536930, - "narHash": "sha256-KcdLerVhBYP7hpUTrP3kj3a0RkFdw85XjoW7krcVtD0=", + "lastModified": 1691705955, + "narHash": "sha256-QgOlQvuDHOSUTYkHRT4GXPpcx5eUPf+J8H650/OkOwA=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "670f6ade5d1486e17f28f5298faf763b87a5ef6f", + "rev": "7d7f797a243c964861b0856ee9117518261072b1", "type": "github" }, "original": { @@ -121,11 +121,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "lastModified": 1691654369, + "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "type": "github" }, "original": { @@ -137,11 +137,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1690066826, - "narHash": "sha256-6L2qb+Zc0BFkh72OS9uuX637gniOjzU6qCDBpjB2LGY=", + "lastModified": 1691280485, + "narHash": "sha256-/8Ct9092OC1TTNzHgbcE9ejQdS2QxZYGqrWXEwUxdtQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce45b591975d070044ca24e3003c830d26fea1c8", + "rev": "240472b7e47a641e9e7675f58b64d3626ca7824d", "type": "github" }, "original": { @@ -153,11 +153,11 @@ }, "nur": { "locked": { - "lastModified": 1690477646, - "narHash": "sha256-pYllwB9v0IAlukaaTcc0YnLuMdEto680J7o0+i5+jRo=", + "lastModified": 1691857331, + "narHash": "sha256-23C3r5crHMB1DilMaXk2D8zEAlFvVcNOOhXo8g/i0wU=", "owner": "nix-community", "repo": "nur", - "rev": "0f85a8d74414f8634d2b5382e837fc964ecf9264", + "rev": "ff84335046f81ce5317ad83063c85c448c5439e0", "type": "github" }, "original": { @@ -208,11 +208,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1690199016, - "narHash": "sha256-yTLL72q6aqGmzHq+C3rDp3rIjno7EJZkFLof6Ika7cE=", + "lastModified": 1691830846, + "narHash": "sha256-ffR5maL8R4gsoF43YZRSBVzB7qYxzG+Ssjjktg80Wy4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c36df4fe4bf4bb87759b1891cab21e7a05219500", + "rev": "5f5d9a3c8bc247eb574823b9f16a79e054dafe73", "type": "github" }, "original": { diff --git a/overlays/local/default.nix b/overlays/local/default.nix index f6e0669c..fd8370a4 100644 --- a/overlays/local/default.nix +++ b/overlays/local/default.nix @@ -17,11 +17,6 @@ final: prev: { wezterm = final.callPackage ./wezterm { inherit (final.darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation UserNotifications; }; - writers = prev.writers.override { - gixy = final.writeShellScriptBin "gixy" '' - true - ''; - }; terraform-providers = prev.terraform-providers // { diff --git a/tewi/access.nix b/tewi/access.nix index 8f4f1c6d..322f7e8e 100644 --- a/tewi/access.nix +++ b/tewi/access.nix @@ -39,7 +39,7 @@ with lib; { recommendedProxySettings = false; proxyPass = "http://127.0.0.1:30746/validate"; extraConfig = '' - proxy_set_header Host $http_host; + proxy_set_header Host $host; proxy_pass_request_body off; proxy_set_header Content-Length ""; auth_request_set $auth_resp_x_vouch_user $upstream_http_x_vouch_user; diff --git a/tewi/home-assistant.nix b/tewi/home-assistant.nix index bf52a6a5..20060128 100644 --- a/tewi/home-assistant.nix +++ b/tewi/home-assistant.nix @@ -205,14 +205,6 @@ in { pyasn1prefix = "${python.pkgs.pysnmp-pyasn1}/${python.sitePackages}"; home-assistant = pkgs.home-assistant.override { packageOverrides = self: super: { - hap-python = super.hap-python.overrideAttrs (old: { - src = if old.version == "4.7.0" then pkgs.fetchFromGitHub { - owner = "ikalchev"; - repo = "HAP-python"; - rev = "refs/tags/${old.version}"; - hash = "sha256-/UBJh1m+WscN9I85/kvlNQnowNybEDyGVuQk4HBDWLE="; - } else lib.warn "HAP-python updated, remove hack!" old.rsc; - }); }; }; in home-assistant.overrideAttrs (old: { diff --git a/tewi/kanidm.nix b/tewi/kanidm.nix index f89806ff..b162bc8f 100644 --- a/tewi/kanidm.nix +++ b/tewi/kanidm.nix @@ -37,7 +37,7 @@ in { domain = "gensokyo.zone"; origin = "https://id.gensokyo.zone"; role = "WriteReplica"; - log_level = "default"; + log_level = "info"; db_fs_type = "zfs"; bindaddress = "0.0.0.0:8081"; ldapbindaddress = "0.0.0.0:636";