Switch sans-serif font to Cantarell

This commit is contained in:
Erwin Boskma 2025-01-09 14:59:30 +01:00
parent cccdd870b7
commit 9df5301f0f
Signed by: erwin
SSH key fingerprint: SHA256:9LmFDe1C6jSrEyqxxvX8NtJBmcbB105XoqyUZF092bg
4 changed files with 24 additions and 33 deletions

View file

@ -453,7 +453,7 @@
programs = { programs = {
sway = { sway = {
enable = true; enable = true;
package = pkgs.swayfx; # package = pkgs.swayfx;
wrapperFeatures = { wrapperFeatures = {
gtk = true; gtk = true;
base = true; base = true;

View file

@ -18,10 +18,7 @@
desktop = { desktop = {
enable = false; enable = false;
}; };
fonts = { fonts.enable = false;
enable = false;
iosevka-aile = false;
};
gnome.enable = false; gnome.enable = false;
klipper.enable = true; klipper.enable = true;
lightdm.enable = false; lightdm.enable = false;

View file

@ -13,25 +13,19 @@ in
{ {
options.eboskma.fonts = { options.eboskma.fonts = {
enable = mkEnableOption "activate fonts"; enable = mkEnableOption "activate fonts";
iosevka-aile = mkOption {
description = "Install Iosevka Aile";
type = types.bool;
default = true;
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
fonts = { fonts = {
fontDir.enable = true; fontDir.enable = true;
packages = packages = with pkgs; [
with pkgs;
[
nerd-fonts.iosevka nerd-fonts.iosevka
nerd-fonts.meslo-lg nerd-fonts.meslo-lg
nerd-fonts.monaspace nerd-fonts.monaspace
nerd-fonts.noto nerd-fonts.noto
nerd-fonts.recursive-mono nerd-fonts.recursive-mono
cantarell-fonts
corefonts corefonts
dejavu_fonts dejavu_fonts
google-fonts google-fonts
@ -42,13 +36,13 @@ in
recursive recursive
ttf_bitstream_vera ttf_bitstream_vera
twitter-color-emoji twitter-color-emoji
] iosevka-aile
++ lib.optional cfg.iosevka-aile iosevka-aile; ];
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {
serif = [ "Recursive Sans Casual Static Medium" ]; serif = [ "Recursive Sans Casual Static Medium" ];
sansSerif = [ (if cfg.iosevka-aile then "Iosevka Aile" else "DejaVu Sans") ]; sansSerif = [ "Cantarell Regular" ];
monospace = [ "Iosevka Nerd Font" ]; monospace = [ "Iosevka Nerd Font" ];
emoji = [ "Twitter Color Emoji" ]; emoji = [ "Twitter Color Emoji" ];
}; };

View file

@ -54,9 +54,9 @@ in
}; };
font = { font = {
name = "Monaspace Neon"; name = "Cantarell Regular";
size = 16; size = 16;
package = pkgs.monaspace; package = pkgs.cantarell-fonts;
}; };
settings = { settings = {