From 885fdb81c6299b593030b327703255f7970249e5 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 10 Jun 2023 13:24:02 +0200 Subject: [PATCH 1/4] fixed wireguard apparently using the same port on both sides can calsh --- flake.lock | 24 +++++++++---------- .../hosts/olympus/wireguard/configuration.nix | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 9d87df6..b295cc5 100644 --- a/flake.lock +++ b/flake.lock @@ -695,11 +695,11 @@ ] }, "locked": { - "lastModified": 1686265146, - "narHash": "sha256-w5RtAG37rqcfqVWEQrJGUvZnUjt/BKdGvf+3XAw09ps=", + "lastModified": 1686342731, + "narHash": "sha256-GwCwviXcc5nrewuFwtsrxys8srrZcI+m8hdIGOt+fHY=", "owner": "nix-community", "repo": "home-manager", - "rev": "69bdd6de50df2082901d94dbf70ecb762d8b636c", + "rev": "0945875a2a20de314093b0f9d4d5448e9b4fdccb", "type": "github" }, "original": { @@ -1066,11 +1066,11 @@ }, "nixpkgs_22-11": { "locked": { - "lastModified": 1686190112, - "narHash": "sha256-BRDO/tnq+ruwv14caQLIqejYJ6w5icja5KYpNunOW24=", + "lastModified": 1686306016, + "narHash": "sha256-I3ziTWye7k07KknmO1WHym1YpKYaeZs+0GsxA9nRyTc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41b86284d3e073bb322da076ae8cd6e116b2ee2a", + "rev": "124e028a0c59db58bc60e855a92eeb9299fd0be3", "type": "github" }, "original": { @@ -1098,11 +1098,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1686216645, - "narHash": "sha256-jwZN8b3fh/md5+zoaekYInEz3JXLQYvxkc9097Ft4V8=", + "lastModified": 1686312845, + "narHash": "sha256-A03Yo7hCda60Kmpw6IuvZl/Zngd9oSijyapjYymOlwk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "58ca986543b591a8269cbce3328293ca8d64480f", + "rev": "ccde02dcbc29eab5fe745c5f4c08c905584627bc", "type": "github" }, "original": { @@ -1213,11 +1213,11 @@ }, "nur": { "locked": { - "lastModified": 1686289365, - "narHash": "sha256-NhFI5JgL4e2EW8rNnJ5B8lBf0awZ3DtMqnhGuv5A8kc=", + "lastModified": 1686347125, + "narHash": "sha256-Ysyr8LNxSx4M7ZWuqZSSxKNHbF0OzcuanM1qknmpC+Y=", "owner": "nix-community", "repo": "NUR", - "rev": "8692a69c88fecbe83659ca4c82f87dbb1a37d5d6", + "rev": "aa3eed5432264e47084272aa9f679ec8aaa795ea", "type": "github" }, "original": { diff --git a/nixos/hosts/olympus/wireguard/configuration.nix b/nixos/hosts/olympus/wireguard/configuration.nix index 59fefa8..ee24f55 100644 --- a/nixos/hosts/olympus/wireguard/configuration.nix +++ b/nixos/hosts/olympus/wireguard/configuration.nix @@ -47,7 +47,7 @@ in { networking.wireguard.interfaces.wg0 = { ips = [ "10.100.0.1/24" ]; - listenPort = 51820; + listenPort = 51821; privateKeyFile = "${vs.wireguard}/privateKey"; peers = [ From 5164f256f9ba8ba4ee386d2c58aa8688376f978c Mon Sep 17 00:00:00 2001 From: Victor Roest Date: Sat, 10 Jun 2023 13:47:02 +0200 Subject: [PATCH 2/4] lock update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index b295cc5..ef511f3 100644 --- a/flake.lock +++ b/flake.lock @@ -695,11 +695,11 @@ ] }, "locked": { - "lastModified": 1686342731, - "narHash": "sha256-GwCwviXcc5nrewuFwtsrxys8srrZcI+m8hdIGOt+fHY=", + "lastModified": 1686391840, + "narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=", "owner": "nix-community", "repo": "home-manager", - "rev": "0945875a2a20de314093b0f9d4d5448e9b4fdccb", + "rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f", "type": "github" }, "original": { @@ -1098,11 +1098,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1686312845, - "narHash": "sha256-A03Yo7hCda60Kmpw6IuvZl/Zngd9oSijyapjYymOlwk=", + "lastModified": 1686371756, + "narHash": "sha256-noR4uAAmla3RFMqQAgMP2BRHnFGw7jEiAMjDBM2pWP4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ccde02dcbc29eab5fe745c5f4c08c905584627bc", + "rev": "90d69b1634d6941300d790ec84d91a4dd40b3902", "type": "github" }, "original": { @@ -1213,11 +1213,11 @@ }, "nur": { "locked": { - "lastModified": 1686347125, - "narHash": "sha256-Ysyr8LNxSx4M7ZWuqZSSxKNHbF0OzcuanM1qknmpC+Y=", + "lastModified": 1686395000, + "narHash": "sha256-zb2vLIvdjjmQq/+nPLHTus4C522Z/Rkp51JmZL/yfyw=", "owner": "nix-community", "repo": "NUR", - "rev": "aa3eed5432264e47084272aa9f679ec8aaa795ea", + "rev": "1dd74ed8fb466ade06a0290e59601a8224ac0e33", "type": "github" }, "original": { From 04d20482e15c0ec00cbfb53e47f7a831d278b4b7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 10 Jun 2023 22:00:26 +0000 Subject: [PATCH 3/4] chore(deps): update flaresolverr/flaresolverr docker tag to v3.2.1 --- nixos/hosts/hades/overseerr/prowlarr.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/hosts/hades/overseerr/prowlarr.nix b/nixos/hosts/hades/overseerr/prowlarr.nix index ff7e946..1fe2599 100644 --- a/nixos/hosts/hades/overseerr/prowlarr.nix +++ b/nixos/hosts/hades/overseerr/prowlarr.nix @@ -5,7 +5,7 @@ _: { }; virtualisation.oci-containers.containers.flaresolverr = { - image = "flaresolverr/flaresolverr:v3.2.0"; + image = "flaresolverr/flaresolverr:v3.2.1"; ports = [ "8191:8191" ]; }; } From 108a8bc0687a948abc668ce8ce878dd1cbb54001 Mon Sep 17 00:00:00 2001 From: Victor Roest Date: Sun, 11 Jun 2023 10:23:26 +0200 Subject: [PATCH 4/4] flake update --- flake.lock | 82 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index ef511f3..fcc0c9e 100644 --- a/flake.lock +++ b/flake.lock @@ -550,12 +550,15 @@ } }, "flake-utils_5": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -580,7 +583,7 @@ }, "flake-utils_7": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1681202837, @@ -721,11 +724,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1685953862, - "narHash": "sha256-aROVoLllFZde9EWr3EP97fXIlOghgrdmO6TeYkZRs5g=", + "lastModified": 1686415556, + "narHash": "sha256-88nOOiLYzYGIMEiQ91DxuyUa786mqunRw6k6GipXmxg=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "45d04a45d3dfcdee5246f7c0dfed056313de2a61", + "rev": "9f97a908e4059221d39c7b7d0906c88b9fcc9c9b", "type": "github" }, "original": { @@ -776,11 +779,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1684964237, - "narHash": "sha256-dDS+GhdZN2MAa2FJKFGM2gpgAXhx+xoMkpVsRx9qpDE=", + "lastModified": 1686468558, + "narHash": "sha256-K69Ojlx3N8I6tRTZsrKFMIqK4yrnJ6/PjfKZi3wchYg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "1bcfcf786bc289ca1bd2c9d29d6f02d9141b1da3", + "rev": "290d00f6db4e80467013728819ad73dd4a394d9a", "type": "gitlab" }, "original": { @@ -1018,16 +1021,16 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1678872516, - "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -1066,11 +1069,11 @@ }, "nixpkgs_22-11": { "locked": { - "lastModified": 1686306016, - "narHash": "sha256-I3ziTWye7k07KknmO1WHym1YpKYaeZs+0GsxA9nRyTc=", + "lastModified": 1686392259, + "narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "124e028a0c59db58bc60e855a92eeb9299fd0be3", + "rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88", "type": "github" }, "original": { @@ -1098,11 +1101,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1686371756, - "narHash": "sha256-noR4uAAmla3RFMqQAgMP2BRHnFGw7jEiAMjDBM2pWP4=", + "lastModified": 1686406799, + "narHash": "sha256-/MHAr6x5/DDEAWFQLgIlyFT9jCXl5O6OWCoNGmfnL3g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "90d69b1634d6941300d790ec84d91a4dd40b3902", + "rev": "9166729004aef4db3390d7199a45f6c7331275a2", "type": "github" }, "original": { @@ -1114,11 +1117,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1685655444, - "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "lastModified": 1686319658, + "narHash": "sha256-tGWdoUAqKnE866mYFlEfc2a99kxFy31hOQJH5YQKrTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", + "rev": "ae766d59b07c450e0f1de8a1bfd6529089f40849", "type": "github" }, "original": { @@ -1198,11 +1201,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1686210684, - "narHash": "sha256-dlQDXx0P/MmiBOhJ733AyD0+ym7U7Pe080gIBSgFK0E=", + "lastModified": 1686407073, + "narHash": "sha256-FFDLQgHsuGQJlqYs8CwDIHhRszDyX0Xb1wjbCwGQVdI=", "owner": "pta2002", "repo": "nixvim", - "rev": "ab8377f319a2d84026244bf81b3b3f8e49c2a518", + "rev": "a2ef858ea5599dc547011c19c40a962bc72a80e7", "type": "github" }, "original": { @@ -1213,11 +1216,11 @@ }, "nur": { "locked": { - "lastModified": 1686395000, - "narHash": "sha256-zb2vLIvdjjmQq/+nPLHTus4C522Z/Rkp51JmZL/yfyw=", + "lastModified": 1686462208, + "narHash": "sha256-L58OUbCXtIzlBJ5QQBETWgPFgmekOwW99LhiyUp9Cto=", "owner": "nix-community", "repo": "NUR", - "rev": "1dd74ed8fb466ade06a0290e59601a8224ac0e33", + "rev": "416eb10d0850d5041169b70e57df91206f7a613d", "type": "github" }, "original": { @@ -1282,11 +1285,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1685361114, - "narHash": "sha256-4RjrlSb+OO+e1nzTExKW58o3WRwVGpXwj97iCta8aj4=", + "lastModified": 1686213770, + "narHash": "sha256-Re6xXLEqQ/HRnThryumyGzEf3Uv0Pl4cuG50MrDofP8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ca2fdbf3edda2a38140184da6381d49f8206eaf4", + "rev": "182af51202998af5b64ddecaa7ff9be06425399b", "type": "github" }, "original": { @@ -1540,6 +1543,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1678901627,