diff --git a/configs/common.nix b/configs/common.nix index 1373f64..6e05d31 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -7,6 +7,7 @@ camasca, home-manager, nixpkgs, + vencord, ... }: let @@ -140,7 +141,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 441235b..cdc7cb3 100644 --- a/exprs/overlay.nix +++ b/exprs/overlay.nix @@ -1,4 +1,4 @@ -final: prev: { +inputs: final: prev: { idea-wrapped = prev.callPackage ./idea-wrapped.nix { }; pycharm-wrapped = prev.callPackage ./pycharm-wrapped.nix { }; google-sans = prev.callPackage ./google-sans.nix { }; @@ -12,4 +12,14 @@ 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; + }; + }); } diff --git a/flake.lock b/flake.lock index 709ed74..b9bfbfe 100644 --- a/flake.lock +++ b/flake.lock @@ -265,7 +265,8 @@ "nixpkgs": "nixpkgs", "systems": "systems", "treefmt-nix": "treefmt-nix", - "ukubot-rs": "ukubot-rs" + "ukubot-rs": "ukubot-rs", + "vencord": "vencord" } }, "rust-overlay": { @@ -346,6 +347,22 @@ "repo": "ukubot-rs", "type": "github" } + }, + "vencord": { + "flake": false, + "locked": { + "lastModified": 1742006004, + "narHash": "sha256-Rym6WPW7EX9WLNZFv1OqDgRZSclH4TWdeSgxbTfnZrM=", + "owner": "Vendicated", + "repo": "Vencord", + "rev": "6f5fd5d0b681cf9fdb34e2191090c020b3f2a042", + "type": "github" + }, + "original": { + "owner": "Vendicated", + "repo": "Vencord", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f879cd9..9af6c43 100644 --- a/flake.nix +++ b/flake.nix @@ -132,5 +132,11 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; + + # ==== non-flakes ==== + vencord = { + url = "github:Vendicated/Vencord"; + flake = false; + }; }; }