[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
|
then pkgs.sway
|
||||||
else null;
|
else null;
|
||||||
cfg = jhome.gui;
|
cfg = jhome.gui;
|
||||||
cursor.package = pkgs.nordzy-cursor-theme;
|
cursor = {
|
||||||
cursor.name = "Nordzy-cursors";
|
package = pkgs.nordzy-cursor-theme;
|
||||||
iconTheme.name = "Papirus-Dark";
|
name = "Nordzy-cursors";
|
||||||
iconTheme.package = pkgs.papirus-icon-theme;
|
};
|
||||||
|
iconTheme = {
|
||||||
|
name = "Papirus-Dark";
|
||||||
|
package = pkgs.papirus-icon-theme;
|
||||||
|
};
|
||||||
in {
|
in {
|
||||||
config = lib.mkIf (jhome.enable && cfg.enable) {
|
config = lib.mkIf (jhome.enable && cfg.enable) {
|
||||||
home.packages = with pkgs;
|
home.packages = with pkgs;
|
||||||
|
@ -32,10 +36,18 @@ in {
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
# Extra fonts
|
# Extra fonts
|
||||||
noto-fonts-cjk # Chinese, Japanese and Korean characters
|
noto-fonts-cjk # Chinese, Japanese and Korean characters
|
||||||
|
(pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
|
||||||
]
|
]
|
||||||
++ lib.optional flatpakEnabled flatpak;
|
++ lib.optional flatpakEnabled flatpak;
|
||||||
|
fonts.fontconfig = {
|
||||||
fonts.fontconfig.enable = true;
|
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
|
# Browser
|
||||||
programs = {
|
programs = {
|
||||||
firefox.enable = true;
|
firefox.enable = true;
|
||||||
|
|
|
@ -3,38 +3,24 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
}: let
|
}: let
|
||||||
cfg = config.jconfig.styling;
|
cfg = config.jconfig.styling;
|
||||||
nerdFontSymbols = pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];};
|
|
||||||
fallbackSymbols = {
|
|
||||||
name = "Symbols Nerd Font";
|
|
||||||
package = nerdFontSymbols;
|
|
||||||
};
|
|
||||||
in {
|
in {
|
||||||
autoEnable = cfg.enable;
|
autoEnable = cfg.enable;
|
||||||
image = cfg.wallpaper;
|
image = cfg.wallpaper;
|
||||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
|
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
|
||||||
polarity = "dark";
|
polarity = "dark";
|
||||||
fonts = {
|
fonts = {
|
||||||
monospace = [
|
monospace = {
|
||||||
{
|
name = "JetBrains Mono";
|
||||||
name = "JetBrains Mono";
|
package = pkgs.jetbrains-mono;
|
||||||
package = pkgs.jetbrains-mono;
|
};
|
||||||
}
|
sansSerif = {
|
||||||
fallbackSymbols
|
name = "Noto Sans";
|
||||||
];
|
package = pkgs.noto-fonts;
|
||||||
sansSerif = [
|
};
|
||||||
{
|
serif = {
|
||||||
name = "Noto Sans";
|
name = "Noto Serif";
|
||||||
package = pkgs.noto-fonts;
|
package = pkgs.noto-fonts;
|
||||||
}
|
};
|
||||||
fallbackSymbols
|
|
||||||
];
|
|
||||||
serif = [
|
|
||||||
{
|
|
||||||
name = "Noto Serif";
|
|
||||||
package = pkgs.noto-fonts;
|
|
||||||
}
|
|
||||||
fallbackSymbols
|
|
||||||
];
|
|
||||||
emoji = {
|
emoji = {
|
||||||
package = pkgs.noto-fonts-emoji;
|
package = pkgs.noto-fonts-emoji;
|
||||||
name = "Noto Color Emoji";
|
name = "Noto Color Emoji";
|
||||||
|
|
Loading…
Add table
Reference in a new issue