{vencord,vesktop}: revert attempt to support fonts (#844)
Revert commit be606eaa87 ("{vencord,vesktop}: fonts (#840)"), which
accidentally introduced IFD and broke evaluation for flakes users.
Link: https://github.com/danth/stylix/pull/844
Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>
This commit is contained in:
parent
7818098f4d
commit
e72aa84da1
2 changed files with 12 additions and 32 deletions
|
|
@ -1,19 +1,9 @@
|
|||
{ config, lib, ... }:
|
||||
let
|
||||
themeText =
|
||||
builtins.readFile (
|
||||
config.lib.stylix.colors {
|
||||
template = ./template.mustache;
|
||||
extension = ".css";
|
||||
}
|
||||
)
|
||||
+ ''
|
||||
:root {
|
||||
--font-primary: ${config.stylix.fonts.sansSerif.name};
|
||||
--font-display: ${config.stylix.fonts.sansSerif.name};
|
||||
--font-code: ${config.stylix.fonts.monospace.name};
|
||||
}
|
||||
'';
|
||||
themeFile = config.lib.stylix.colors {
|
||||
template = ./template.mustache;
|
||||
extension = ".css";
|
||||
};
|
||||
in
|
||||
{
|
||||
options.stylix.targets.vencord.enable =
|
||||
|
|
@ -22,6 +12,6 @@ in
|
|||
config =
|
||||
lib.mkIf (config.stylix.enable && config.stylix.targets.vencord.enable)
|
||||
{
|
||||
xdg.configFile."Vencord/themes/stylix.theme.css".text = themeText;
|
||||
xdg.configFile."Vencord/themes/stylix.theme.css".source = themeFile;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,20 +5,10 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
themeText =
|
||||
builtins.readFile (
|
||||
config.lib.stylix.colors {
|
||||
template = ../vencord/template.mustache;
|
||||
extension = ".css";
|
||||
}
|
||||
)
|
||||
+ ''
|
||||
:root {
|
||||
--font-primary: ${config.stylix.fonts.sansSerif.name};
|
||||
--font-display: ${config.stylix.fonts.sansSerif.name};
|
||||
--font-code: ${config.stylix.fonts.monospace.name};
|
||||
}
|
||||
'';
|
||||
themeFile = config.lib.stylix.colors {
|
||||
template = ../vencord/template.mustache;
|
||||
extension = ".css";
|
||||
};
|
||||
in
|
||||
{
|
||||
options.stylix.targets.vesktop.enable =
|
||||
|
|
@ -29,12 +19,12 @@ in
|
|||
(
|
||||
lib.mkMerge [
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
|
||||
xdg.configFile."vesktop/themes/stylix.theme.css".text = themeText;
|
||||
xdg.configFile."vesktop/themes/stylix.theme.css".source = themeFile;
|
||||
})
|
||||
|
||||
(lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
|
||||
home.file."Library/Application Support/vesktop/themes/stylix.theme.css".text =
|
||||
themeText;
|
||||
home.file."Library/Application Support/vesktop/themes/stylix.theme.css".source =
|
||||
themeFile;
|
||||
})
|
||||
]
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue