[feat] fonts: use home-manger default fonts
This removes the need for my stylix fork (for me).
This commit is contained in:
parent
4917d30606
commit
bf0ee5ba2b
2 changed files with 30 additions and 32 deletions
|
@ -16,10 +16,14 @@
|
|||
then pkgs.sway
|
||||
else null;
|
||||
cfg = jhome.gui;
|
||||
cursor.package = pkgs.nordzy-cursor-theme;
|
||||
cursor.name = "Nordzy-cursors";
|
||||
iconTheme.name = "Papirus-Dark";
|
||||
iconTheme.package = pkgs.papirus-icon-theme;
|
||||
cursor = {
|
||||
package = pkgs.nordzy-cursor-theme;
|
||||
name = "Nordzy-cursors";
|
||||
};
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
in {
|
||||
config = lib.mkIf (jhome.enable && cfg.enable) {
|
||||
home.packages = with pkgs;
|
||||
|
@ -32,10 +36,18 @@ in {
|
|||
wl-clipboard
|
||||
# Extra fonts
|
||||
noto-fonts-cjk # Chinese, Japanese and Korean characters
|
||||
(pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
|
||||
]
|
||||
++ lib.optional flatpakEnabled flatpak;
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
fonts.fontconfig = {
|
||||
enable = true;
|
||||
defaultFonts = {
|
||||
emoji = ["Noto Color Emoji"];
|
||||
monospace = ["JetBrains Mono" "Symbols Nerd Font"];
|
||||
serif = ["Noto Serif" "Symbols Nerd Font"];
|
||||
sansSerif = ["Noto Sans" "Symbols Nerd Font"];
|
||||
};
|
||||
};
|
||||
# Browser
|
||||
programs = {
|
||||
firefox.enable = true;
|
||||
|
|
|
@ -3,38 +3,24 @@
|
|||
pkgs,
|
||||
}: let
|
||||
cfg = config.jconfig.styling;
|
||||
nerdFontSymbols = pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];};
|
||||
fallbackSymbols = {
|
||||
name = "Symbols Nerd Font";
|
||||
package = nerdFontSymbols;
|
||||
};
|
||||
in {
|
||||
autoEnable = cfg.enable;
|
||||
image = cfg.wallpaper;
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
|
||||
polarity = "dark";
|
||||
fonts = {
|
||||
monospace = [
|
||||
{
|
||||
name = "JetBrains Mono";
|
||||
package = pkgs.jetbrains-mono;
|
||||
}
|
||||
fallbackSymbols
|
||||
];
|
||||
sansSerif = [
|
||||
{
|
||||
name = "Noto Sans";
|
||||
package = pkgs.noto-fonts;
|
||||
}
|
||||
fallbackSymbols
|
||||
];
|
||||
serif = [
|
||||
{
|
||||
name = "Noto Serif";
|
||||
package = pkgs.noto-fonts;
|
||||
}
|
||||
fallbackSymbols
|
||||
];
|
||||
monospace = {
|
||||
name = "JetBrains Mono";
|
||||
package = pkgs.jetbrains-mono;
|
||||
};
|
||||
sansSerif = {
|
||||
name = "Noto Sans";
|
||||
package = pkgs.noto-fonts;
|
||||
};
|
||||
serif = {
|
||||
name = "Noto Serif";
|
||||
package = pkgs.noto-fonts;
|
||||
};
|
||||
emoji = {
|
||||
package = pkgs.noto-fonts-emoji;
|
||||
name = "Noto Color Emoji";
|
||||
|
|
Loading…
Reference in a new issue