From 4af2686c1c62176d0ce28c4d55e813ae5ed52b6f Mon Sep 17 00:00:00 2001 From: Daniel Thwaites Date: Mon, 10 Feb 2025 19:23:47 +0000 Subject: [PATCH] nixcord: use new template format (#852) Fixes: eb5f81756731 ("{vencord,vesktop}: support fonts without IFD (#846)") Link: https://github.com/danth/stylix/pull/852 Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- modules/nixcord/hm.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/nixcord/hm.nix b/modules/nixcord/hm.nix index 7042241b..c3a3e6d2 100644 --- a/modules/nixcord/hm.nix +++ b/modules/nixcord/hm.nix @@ -5,11 +5,12 @@ ... }: let - themeFile = config.lib.stylix.colors { - template = ../vencord/template.mustache; - extension = ".css"; - }; - themeFileName = "stylix.theme.css"; + template = + let + inherit (config.lib.stylix) colors; + inherit (config.stylix) fonts; + in + import ../vencord/template.nix { inherit colors fonts; }; cfg = config.stylix.targets.nixcord; in { @@ -26,15 +27,15 @@ in in lib.mkMerge [ (lib.mkIf nixcord.discord.enable { - "Vencord/themes/stylix.theme.css".source = themeFile; + "Vencord/themes/stylix.theme.css".text = template; }) (lib.mkIf nixcord.vesktop.enable { - "vesktop/themes/stylix.theme.css".source = themeFile; + "vesktop/themes/stylix.theme.css".text = template; }) ]; - programs.nixcord.config.enabledThemes = [ themeFileName ]; + programs.nixcord.config.enabledThemes = [ "stylix.theme.css" ]; } ); }