diff --git a/boxes/desktop/home.nix b/boxes/desktop/home.nix index 315f4da..a0a130c 100644 --- a/boxes/desktop/home.nix +++ b/boxes/desktop/home.nix @@ -8,6 +8,7 @@ let shell = import ../../common/shell.nix { inherit config pkgs; }; p = import ../../common/pkgs.nix { inherit pkgs config; }; _p1 = p.dev ++ p.gui ++ p.general ++ p.scripts ++ p.gaming; + ol = p.overlays; zshInitArgs = [ "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme" "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" @@ -68,6 +69,7 @@ nixpkgs.config.allowInsecurePredicate = (pkg: true); # The home.packages option allows you to install Nix packages into your # environment. home.packages = _p1; + nixpkgs.overlays = [ol.discord]; # Home Manager is pretty good at managing dotfiles. The primary way to manage # plain files is through 'home.file'. home.file = files; diff --git a/common/pkgs.nix b/common/pkgs.nix index 95e780d..ff45584 100644 --- a/common/pkgs.nix +++ b/common/pkgs.nix @@ -36,6 +36,16 @@ in ])) nodejs_22 ]; + overlays = { + discord = (final: prev: { + discord = prev.discord.override { + # withOpenASAR = false; + # withVencord = true; + # pname = "Discord"; + vencord = cpkg.vencord; + }; + }); + }; gui = with pkgs;[ python312Packages.openai-whisper cinny-desktop @@ -54,17 +64,20 @@ in inkscape #OCR ENGINE tesseract4 + (pkgs.discord.override { + withVencord = true; + }) # discord = cpkg.discord.override { # withOpenASAR = true; # withVencord = true; # }; - (self: super: { - discord = super.discord.overrideAttrs (oldAttrs: { - # mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; - withVencord = true; - vencord = cpkg.vencord; - }); - }) + # (self: super: { + # discord = super.discord (oldAttrs: { + # # mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; + # withVencord = true; + # vencord = cpkg.vencord; + # }); + # }) # (pkgs.discord.override { # vencord = cpkg.vencord; # }) diff --git a/customPackages/vencord/package.nix b/customPackages/vencord/package.nix index 10f1d28..8d37e7f 100644 --- a/customPackages/vencord/package.nix +++ b/customPackages/vencord/package.nix @@ -59,6 +59,7 @@ buildNpmPackage rec { passthru.updateScript = ./update.sh; meta = with lib; { + name = pname; description = "Vencord web extension"; homepage = "https://github.com/Vendicated/Vencord"; license = licenses.gpl3Only;