diff --git a/configs/common.nix b/configs/common.nix index 49fcc54..fca70e9 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -7,6 +7,7 @@ camasca, home-manager, nixpkgs, + vencord, ... }: let @@ -143,7 +144,7 @@ in nixpkgs = { config.allowUnfree = true; flake.setNixPath = false; - overlays = [ (import ../exprs/overlay.nix) ]; + overlays = [ (import ../exprs/overlay.nix { inherit vencord; }) ]; }; programs = { diff --git a/exprs/overlay.nix b/exprs/overlay.nix index 3cca598..abf7dbf 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -1,4 +1,4 @@ -final: prev: { +inputs: final: prev: { idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix { }; urbackup-client = prev.urbackup-client.overrideAttrs (old: { @@ -10,4 +10,34 @@ final: prev: { "--localstatedir=/var/lib" ]; }); + + vencord = prev.vencord.overrideAttrs (old: { + version = "${old.version}+git.${inputs.vencord.shortRev}"; + src = inputs.vencord; + + env = old.env // { + VENCORD_REMOTE = "Vendicated/Vencord"; + VENCORD_HASH = inputs.vencord.shortRev; + + ESBUILD_BINARY_PATH = prev.lib.getExe ( + prev.esbuild.overrideAttrs ( + final: _: { + version = "0.25.0"; + src = prev.fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${final.version}"; + hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ) + ); + }; + + pnpmDeps = old.pnpmDeps.overrideAttrs (_: { + outputHash = "sha256-0afgeJkK0OQWoqF0b8pHPMsiTKox84YmwBhtNWGyVAg="; + outputHashAlgo = "sha256"; + }); + }); } diff --git a/flake.lock b/flake.lock index 88d895d..4cc118b 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1739824998, - "narHash": "sha256-YCPiPre4xza1h4VRZXaJgqQyvdVwkYaTTKmIWxoNuf4=", + "lastModified": 1739661813, + "narHash": "sha256-4OiClO0DIDegZux3FrFGIhiCLmjajWPMXORJiVnEeWo=", "owner": "uku3lig", "repo": "api-rs", - "rev": "69c1466b78c83fc859787e97b80b036f49b38e7b", + "rev": "2a2b0de722df8f067d30033c06cbd42fd86b6598", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "crane": { "locked": { - "lastModified": 1739936662, - "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", + "lastModified": 1739638817, + "narHash": "sha256-pPiI27T416xAAUETorkLAgHQMiLT92moOrf0ItHhtPA=", "owner": "ipetkov", "repo": "crane", - "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", + "rev": "bef2b45cd1273a9e621fb5292de89f4ed59ad812", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1739913864, - "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", + "lastModified": 1739790043, + "narHash": "sha256-4gK4zdNDQ4PyGFs7B6zp9iPIBy9E+bVJiZ0XAmncvgQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "97ac0801d187b2911e8caa45316399de12f6f199", + "rev": "c1ea92cdfb85bd7b0995b550581d9fd1c3370bf9", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1739952117, - "narHash": "sha256-90SN/KY+kInmxPrCR+4sLJA8A860A0RVp/ZxliYlYIs=", + "lastModified": 1739779327, + "narHash": "sha256-ZNycX3106IamF7OBT81AJN8sPyMa6DWhTYdd06WPLbo=", "owner": "soopyc", "repo": "mystia", - "rev": "4f14c9163958ef55ae812c640be213f56cc1325a", + "rev": "f71433e1b01985f3314779022610af79fb6e7a4f", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -248,6 +248,7 @@ "systems": "systems", "treefmt-nix": "treefmt-nix", "ukubot-rs": "ukubot-rs", + "vencord": "vencord", "vscode-extensions": "vscode-extensions" } }, @@ -294,11 +295,11 @@ ] }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1738953846, + "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", "type": "github" }, "original": { @@ -330,6 +331,22 @@ "type": "github" } }, + "vencord": { + "flake": false, + "locked": { + "lastModified": 1739756829, + "narHash": "sha256-Szweth0AVabzI336SSHKTTET+0T77TMkexuIUukg9KY=", + "owner": "Vendicated", + "repo": "Vencord", + "rev": "1f6720318354e026fe24ed3e76935ec9e42d5193", + "type": "github" + }, + "original": { + "owner": "Vendicated", + "repo": "Vencord", + "type": "github" + } + }, "vscode-extensions": { "inputs": { "flake-compat": [], @@ -341,11 +358,11 @@ ] }, "locked": { - "lastModified": 1739929767, - "narHash": "sha256-4mcftoL28KCeBX+wyD37IdVGeY2MyXxigL8Jj2rzsus=", + "lastModified": 1739757126, + "narHash": "sha256-9uYAIjcsgRm4yRpO30a7KMYxd/bozenpe853bGXcvbc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "fe953b35b591faf57660800fb6e8b74956eea846", + "rev": "b18fbfeaa9fa5773cc0fa3b03326343fdfc5403e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4f98d99..14f1133 100644 --- a/flake.nix +++ b/flake.nix @@ -139,5 +139,11 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; + + # ==== non-nix inputs ==== + vencord = { + url = "github:Vendicated/Vencord"; + flake = false; + }; }; } diff --git a/systems/vesuvio/mail/maddy.nix b/systems/vesuvio/mail/maddy.nix index 688fb95..5671706 100644 --- a/systems/vesuvio/mail/maddy.nix +++ b/systems/vesuvio/mail/maddy.nix @@ -9,7 +9,7 @@ in imports = [ env.generate ]; security.acme.certs.${hostname} = { - inherit (config.services.maddy) group; + group = config.services.maddy.group; extraLegoRenewFlags = [ "--reuse-key" ]; # soopyc said its more secure }; diff --git a/systems/vesuvio/mail/rspamd.nix b/systems/vesuvio/mail/rspamd.nix index f073bed..e116997 100644 --- a/systems/vesuvio/mail/rspamd.nix +++ b/systems/vesuvio/mail/rspamd.nix @@ -11,7 +11,7 @@ in services = { redis.servers.rspamd = { enable = true; - inherit (config.services.rspamd) user; + user = config.services.rspamd.user; port = 0; # disable tcp };