From c14c0b6f676e5d6daca8fb1a22d5146e1e942e02 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 29 Jun 2024 11:18:11 +0800 Subject: [PATCH] flake: update lock file --- flake.lock | 90 +++++++++++++++---------------- hosts/blacksteel/README.md | 1 + hosts/lightsail-tokyo/default.nix | 23 +++----- 3 files changed, 54 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index c3bb7e3..2817894 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1719088950, - "narHash": "sha256-g6eIW4pqWtDNryOuhqRPGhUnkSmwwWG0GB+IrObmbh0=", + "lastModified": 1719619905, + "narHash": "sha256-i8Cbi+176SUig3BEHYQ38cb2c+zWSnG0Kg2G1TLosDM=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "81e7515e70e6dcc24060abb41f7777932bfa6b82", + "rev": "5869e0b884c95bc8791fcf30162d009a0d6267ba", "type": "github" }, "original": { @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1718403459, - "narHash": "sha256-6d+nrN/L8DUCCEioQkdXy71+lYs09sP4nExSMjEkw30=", + "lastModified": 1719288828, + "narHash": "sha256-jDKNistAmctLXTJvX8+ALJB2JgXqJHxkCoV+WkmqKhE=", "owner": "berberman", "repo": "flakes", - "rev": "de292d23437ff2a6c41b32f3449fae83deb88cfb", + "rev": "a050b5751c88e01135d20fe6c7d7ced20d623bcc", "type": "github" }, "original": { @@ -53,11 +53,11 @@ ] }, "locked": { - "lastModified": 1718730147, - "narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=", + "lastModified": 1719249093, + "narHash": "sha256-0q1haa3sw6GbmJ+WhogMnducZGjEaCa/iR6hF2vq80I=", "owner": "ipetkov", "repo": "crane", - "rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c", + "rev": "9791c77eb7e98b8d8ac5b0305d47282f994411ca", "type": "github" }, "original": { @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1718846788, - "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", + "lastModified": 1719582740, + "narHash": "sha256-s4WsLu2L8EzF5Hg2TkelFLVhKGL108AySnlw8voPe5U=", "owner": "nix-community", "repo": "disko", - "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", + "rev": "115311bc395f24c1b553338fec4b3aa28cbf5ae2", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1719037157, - "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", + "lastModified": 1719588253, + "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", + "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", "type": "github" }, "original": { @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1719092336, - "narHash": "sha256-GMvU34c+2Yd4O2Sklo/7UIka1hzGzIk3p+3CY1Mn1Qo=", + "lastModified": 1719610737, + "narHash": "sha256-CUs7aehu5w/ikdY6L6Spyw9i6y9elELADhma9ngzBus=", "owner": "jacekszymanski", "repo": "nixcasks", - "rev": "50998b7aa6f602f0be13fdba05c5d5abf5d0eda1", + "rev": "1d2ef7c6c6c6c87bdd4a92d4899bc988eb6d9444", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719145664, - "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", + "lastModified": 1719552654, + "narHash": "sha256-PX3msbC5KdwCDnucGtir3qzlzv+1fuiU4tk17nljFIE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", + "rev": "3980e7816c99d9e4da7a7b762e5b294055b73b2f", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1719468428, + "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "type": "github" }, "original": { @@ -413,11 +413,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1718811006, - "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", + "lastModified": 1719234068, + "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", + "rev": "90bd1b26e23760742fdcb6152369919098f05417", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nur": { "locked": { - "lastModified": 1719153056, - "narHash": "sha256-nIp6HOIrPTMeIoaaj8MavebUI1HBeq1iz9P0nzWq1CI=", + "lastModified": 1719624082, + "narHash": "sha256-RpeJO2UN+XP1fiA6gPKwvW6+gw9m09lDuWdg67g+Zds=", "owner": "nix-community", "repo": "NUR", - "rev": "46ab9f286d5546781726537039455867a59c19a3", + "rev": "e7597af73696a7217e6fa5cacf1da240a2a42165", "type": "github" }, "original": { @@ -523,11 +523,11 @@ ] }, "locked": { - "lastModified": 1718879355, - "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", + "lastModified": 1719259945, + "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", + "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07", "type": "github" }, "original": { @@ -578,11 +578,11 @@ ] }, "locked": { - "lastModified": 1719109180, - "narHash": "sha256-96dwGCV2yQxDozDATqbsM3YU0ft3Isw3cwVDO/eNCv8=", + "lastModified": 1719627476, + "narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5fc5f3a0d7eabf7db86851e6423f9d7fbceaf89d", + "rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1719111739, - "narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=", + "lastModified": 1719268571, + "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811", + "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "type": "github" }, "original": { @@ -637,11 +637,11 @@ ] }, "locked": { - "lastModified": 1718844164, - "narHash": "sha256-QUXWv6llKIQ5To2N24d9dRI78Hqfm9iFyhvmvlOICNo=", + "lastModified": 1719449101, + "narHash": "sha256-rRrz763KKi6GnSZF4WF34kpJ9eMXR3AOPOWN/7hO1Zs=", "owner": "nix-community", "repo": "srvos", - "rev": "557ff94aa1b48a723f8fa16eb9e7a2e6de991682", + "rev": "e938f07e5cd9d11576d3860b68c117932c161006", "type": "github" }, "original": { @@ -672,11 +672,11 @@ ] }, "locked": { - "lastModified": 1718522839, - "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", + "lastModified": 1719243788, + "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", + "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "type": "github" }, "original": { diff --git a/hosts/blacksteel/README.md b/hosts/blacksteel/README.md index 5365ebe..6145495 100644 --- a/hosts/blacksteel/README.md +++ b/hosts/blacksteel/README.md @@ -21,3 +21,4 @@ Homelab, hosting random stuff through tailscale and rathole. - [ ] tpm luks unlocking - [ ] nouveau -> nvidia - [x] networkmanager -> iwd +- [ ] jellyfin hardware acceleration diff --git a/hosts/lightsail-tokyo/default.nix b/hosts/lightsail-tokyo/default.nix index 6397f6e..317bf5b 100644 --- a/hosts/lightsail-tokyo/default.nix +++ b/hosts/lightsail-tokyo/default.nix @@ -58,15 +58,8 @@ }; ### Services - networking.firewall.allowedUDPPorts = [ - # hysteria - 443 - ]; - networking.firewall.allowedTCPPorts = [ - # caddy - 80 - 443 - ]; + networking.firewall.allowedUDPPorts = [443]; # hysteria + networking.firewall.allowedTCPPorts = [80 443]; # caddy systemd.tmpfiles.settings = { "10-www" = { @@ -83,12 +76,12 @@ "element" = pkgs.element-web.override { element-web-unwrapped = pkgs.element-web-unwrapped.overrideAttrs (oldAttrs: { - version = "1.11.69"; + version = "1.11.70-rc.0"; src = oldAttrs.src.overrideAttrs { - outputHash = "sha256-oFSaKtig1z3jepLpwJW4i5VskMBhKUIbPsCfLQuCgMY="; + outputHash = "sha256-LnPqwXczECH7XnVvGnoUQpZct2jmGEFVpJ1nTewAHC8="; }; offlineCache = oldAttrs.offlineCache.overrideAttrs { - outputHash = "sha256-ClpD/PIW3P1+d7KqDTl6gWNbqKaUi6JypE/yaVsB+Oc="; + outputHash = "sha256-yAAZXnxrBGuTWUJcL6Su0F5H2D5MNg9PUU7Uj8XT8N8="; }; }); @@ -176,12 +169,12 @@ services.keycloak = { enable = true; settings = { + cache = "local"; + hostname = "id.ny4.dev"; http-host = "127.0.0.1"; http-port = 8800; proxy = "edge"; - hostname-strict-backchannel = true; - hostname = "id.ny4.dev"; - cache = "local"; + # proxy-headers = "xforwarded"; # FIXME: Key material not provided to setup HTTPS. }; database.passwordFile = toString (pkgs.writeText "password" "keycloak"); };