fonts may or may not be fixed

This commit is contained in:
Reid 2024-04-02 19:53:23 -07:00
parent a6db96fb0a
commit 4465048b41
3 changed files with 41 additions and 39 deletions

View file

@ -5,22 +5,22 @@ let
cfg = config.modules.desktop;
in {
options.modules.desktop = {
envProto = mkOption {
type = types.nullOr (types.enum ["x11" "wayland"]);
description = "What display protocol to use";
};
envProto = mkOption {
type = types.nullOr (types.enum ["x11" "wayland"]);
description = "What display protocol to use";
};
};
config = mkMerge [
{
qt = {
enable = true;
platformTheme = "gnome";
style = "adwaita-dark";
enable = true;
platformTheme = "gnome";
style = "adwaita-dark";
};
modules.desktop.fonts.enable = builtins.trace "enabling fonts" true;
modules.desktop.fonts.baseFonts = builtins.trace "enabling basefonts" true;
modules.desktop.fonts.enable = true;
modules.desktop.fonts.baseFonts = true;
}
(mkIf (cfg.envProto == "wayland") {
hm.home.packages = with pkgs; [ wl-clipboard-x11 ];
@ -41,7 +41,7 @@ in {
(mkIf (cfg.envProto == "x11") {
hm.home.packages = with pkgs; [ xclip ];
services.xserver.excludePackages = [ pkgs.xterm ];
services.xserver.excludePackages = [ pkgs.xterm ];
})
];
}