diff --git a/configs/common.nix b/configs/common.nix index fca70e9..49fcc54 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -7,7 +7,6 @@ camasca, home-manager, nixpkgs, - vencord, ... }: let @@ -144,7 +143,7 @@ in nixpkgs = { config.allowUnfree = true; flake.setNixPath = false; - overlays = [ (import ../exprs/overlay.nix { inherit vencord; }) ]; + overlays = [ (import ../exprs/overlay.nix) ]; }; programs = { diff --git a/exprs/overlay.nix b/exprs/overlay.nix index abf7dbf..3cca598 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -1,4 +1,4 @@ -inputs: final: prev: { +final: prev: { idea-ultimate-fixed = prev.callPackage ./idea-fixed.nix { }; urbackup-client = prev.urbackup-client.overrideAttrs (old: { @@ -10,34 +10,4 @@ inputs: 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 6cee4e7..88d895d 100644 --- a/flake.lock +++ b/flake.lock @@ -248,7 +248,6 @@ "systems": "systems", "treefmt-nix": "treefmt-nix", "ukubot-rs": "ukubot-rs", - "vencord": "vencord", "vscode-extensions": "vscode-extensions" } }, @@ -331,22 +330,6 @@ "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": [], diff --git a/flake.nix b/flake.nix index 14f1133..4f98d99 100644 --- a/flake.nix +++ b/flake.nix @@ -139,11 +139,5 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; - - # ==== non-nix inputs ==== - vencord = { - url = "github:Vendicated/Vencord"; - flake = false; - }; }; }