From 0cdc4ca10e9c12a13a3e344ffa937765c01369a4 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 2 Apr 2025 09:13:08 +0200 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/f4330d22f1c5d2ba72d3d22df5597d123fdb60a9?narHash=sha256-%2Bu2UunDA4Cl5Fci3m7S643HzKmIDAe%2BfiXrLqYsR2fs%3D' (2025-03-07) → 'github:hercules-ci/flake-parts/c621e8422220273271f52058f618c94e405bb0f5?narHash=sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY%3D' (2025-04-01) • Updated input 'home-manager': 'github:nix-community/home-manager/c21383b556609ce1ad901aa08b4c6fbd9e0c7af0?narHash=sha256-u81nqA4UuRatKDkzUuIfVYdLMw8birEy%2B99oXpdyXhY%3D' (2025-04-01) → 'github:nix-community/home-manager/5ee44bc7c2e853f144390a12ebe5174ad7e3b9e0?narHash=sha256-rvU79DJ6rPDxiH0sTp686Vlm%2BJewwAZPGcwt8OfHJbM%3D' (2025-04-02) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1?narHash=sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om%2BD4UnDhlDW9BE%3D' (2025-03-30) → 'github:NixOS/nixpkgs/77b584d61ff80b4cef9245829a6f1dfad5afdfa3?narHash=sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm%2BseVaGhs%3D' (2025-03-31) • Updated input 'vencord': 'github:Vendicated/Vencord/b3bff83dd5040950c55e09bed9e47a60490f81d8?narHash=sha256-WzmRz0wf/Ss90FmXXp6gaylC0k/k/QkFaFddlnLo%2BXk%3D' (2025-03-21) → 'github:Vendicated/Vencord/93f98cee2c4820135acbb010ca4abb17c7f5c064?narHash=sha256-n5xkOy0CCRKROuicm8rg5tDpvldaSwOvXAsXgBGEXXQ%3D' (2025-04-02) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 6ec2d51..cfe70ba 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1743482579, - "narHash": "sha256-u81nqA4UuRatKDkzUuIfVYdLMw8birEy+99oXpdyXhY=", + "lastModified": 1743556466, + "narHash": "sha256-rvU79DJ6rPDxiH0sTp686Vlm+JewwAZPGcwt8OfHJbM=", "owner": "nix-community", "repo": "home-manager", - "rev": "c21383b556609ce1ad901aa08b4c6fbd9e0c7af0", + "rev": "5ee44bc7c2e853f144390a12ebe5174ad7e3b9e0", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -335,11 +335,11 @@ "vencord": { "flake": false, "locked": { - "lastModified": 1742560481, - "narHash": "sha256-WzmRz0wf/Ss90FmXXp6gaylC0k/k/QkFaFddlnLo+Xk=", + "lastModified": 1743565755, + "narHash": "sha256-n5xkOy0CCRKROuicm8rg5tDpvldaSwOvXAsXgBGEXXQ=", "owner": "Vendicated", "repo": "Vencord", - "rev": "b3bff83dd5040950c55e09bed9e47a60490f81d8", + "rev": "93f98cee2c4820135acbb010ca4abb17c7f5c064", "type": "github" }, "original": { From b262ff1ded87b1222eeb5c6991098d4312ac8bbb Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 2 Apr 2025 09:22:10 +0200 Subject: [PATCH 2/3] fix(exprs): update vencord hash and esbuild --- exprs/overlay.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/exprs/overlay.nix b/exprs/overlay.nix index 2befade..3156758 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -23,6 +23,11 @@ inputs: final: prev: { env = old.env // { VENCORD_REMOTE = "Vendicated/Vencord"; VENCORD_HASH = inputs.vencord.shortRev; + ESBUILD_BINARY_PATH = prev.lib.getExe prev.esbuild; # 0.25.1 + }; + + pnpmDeps = old.pnpmDeps.overrideAttrs { + outputHash = "sha256-hO6QKRr4jTfesRDAEGcpFeJmGTGLGMw6EgIvD23DNzw="; }; }); } From cf9c46fddc67ea84c5e63ee3efe36baa95c3b831 Mon Sep 17 00:00:00 2001 From: uku Date: Wed, 2 Apr 2025 09:23:55 +0200 Subject: [PATCH 3/3] fix(systems/vesuvio): remove nitter overrides --- systems/vesuvio/nitter.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/systems/vesuvio/nitter.nix b/systems/vesuvio/nitter.nix index 74ae5fa..fc4a75e 100644 --- a/systems/vesuvio/nitter.nix +++ b/systems/vesuvio/nitter.nix @@ -1,39 +1,23 @@ { - pkgs, config, _utils, ... }: let accounts = _utils.setupSingleSecret config "nitterAccounts" { }; - - nitterUpdated = pkgs.nitter.overrideAttrs { - version = "0-unstable-2025-02-26"; - src = pkgs.fetchFromGitHub { - owner = "zedeus"; - repo = "nitter"; - rev = "41fa47bfbf3917e9b3ac4f7b49c89a75a7a2bd44"; - hash = "sha256-cmYlmzCJl1405TuYExGw3AOmjdY0r7ObmmLCAom+Fyw="; - }; - }; in { imports = [ accounts.generate ]; services.nitter = { enable = true; - package = nitterUpdated; - guestAccounts = accounts.path; + sessionsFile = accounts.path; server = { hostname = "nit.uku.moe"; port = 8081; }; }; - systemd.services.nitter.environment = { - NITTER_SESSIONS_FILE = "%d/guestAccountsFile"; - }; - services.nginx.virtualHosts."nit.uku.moe" = { forceSSL = true; enableACME = true;