From 57dafbe7e113eb25ddf36603f682eff206c38e8c Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Sat, 12 Jul 2025 20:17:40 +0800 Subject: [PATCH] gui: Change font configuration --- home/david/modules/programs/ghostty.nix | 2 +- home/david/modules/programs/waybar.nix | 4 ++-- home/david/modules/programs/zed.nix | 2 +- nixos/configurations/Akun/stylix.nix | 6 +++--- nixos/configurations/Tytonidae/stylix.nix | 6 +++--- nixos/modules/gui/default.nix | 20 ++++---------------- 6 files changed, 14 insertions(+), 26 deletions(-) diff --git a/home/david/modules/programs/ghostty.nix b/home/david/modules/programs/ghostty.nix index cdd3dd3..338cc3f 100644 --- a/home/david/modules/programs/ghostty.nix +++ b/home/david/modules/programs/ghostty.nix @@ -36,7 +36,7 @@ # "cv30" # ]; - # font-family = "Maple Mono SC NF"; + # font-family = "Maple Mono NF CN"; font-feature = [ "calt" "zero" diff --git a/home/david/modules/programs/waybar.nix b/home/david/modules/programs/waybar.nix index 9056c36..8a0cbd1 100644 --- a/home/david/modules/programs/waybar.nix +++ b/home/david/modules/programs/waybar.nix @@ -142,9 +142,9 @@ in { ]; style = '' * { - font-family: LXGW Wenkai, Maple Mono NF CN; + font-family: Libertinus Serif, Maple Mono NF CN; font-weight: bold; - font-size: 14px; + font-size: 16px; } window#waybar { diff --git a/home/david/modules/programs/zed.nix b/home/david/modules/programs/zed.nix index 43362fb..bc87bdb 100644 --- a/home/david/modules/programs/zed.nix +++ b/home/david/modules/programs/zed.nix @@ -105,7 +105,7 @@ in { "cv03" = true; "ss08" = true; }; - ui_font_family = "Source Han Sans SC"; + ui_font_family = "Source Han Sans"; theme = "Gruvbox Dark Hard"; vim_mode = true; vim = { diff --git a/nixos/configurations/Akun/stylix.nix b/nixos/configurations/Akun/stylix.nix index c273bdc..223e3a1 100644 --- a/nixos/configurations/Akun/stylix.nix +++ b/nixos/configurations/Akun/stylix.nix @@ -15,12 +15,12 @@ }; fonts = { serif = { - package = pkgs.lxgw-wenkai; - name = "LXGW WenKai"; + package = pkgs.libertinus; + name = "Libertinus Serif"; }; sansSerif = { package = pkgs.source-han-sans; - name = "Source Han Sans SC"; + name = "Source Han Sans"; }; monospace = { package = pkgs.maple-mono.NF-CN; diff --git a/nixos/configurations/Tytonidae/stylix.nix b/nixos/configurations/Tytonidae/stylix.nix index d510cfe..68ba3bb 100644 --- a/nixos/configurations/Tytonidae/stylix.nix +++ b/nixos/configurations/Tytonidae/stylix.nix @@ -15,12 +15,12 @@ }; fonts = { serif = { - package = pkgs.lxgw-wenkai; - name = "LXGW WenKai"; + package = pkgs.libertinus; + name = "Libertinus Serif"; }; sansSerif = { package = pkgs.source-han-sans; - name = "Source Han Sans SC"; + name = "Source Han Sans"; }; monospace = { package = pkgs.maple-mono.NF-CN; diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index 1814e97..c8d8d53 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -31,31 +31,19 @@ in { fonts = { enableDefaultPackages = false; packages = with pkgs; [ - nerd-fonts.fira-code maple-mono.NF-CN - noto-fonts - noto-fonts-cjk-sans - noto-fonts-cjk-serif noto-fonts-emoji - lxgw-wenkai - source-sans - source-serif source-han-serif source-han-sans + libertinus ]; fontconfig.defaultFonts = { serif = [ - "LXGW WenKai" - "Source Han Serif SC" - "Noto Serif CJK SC" - "Source Serif 4" - "Noto Serif" + "Libertinus Serif" + "Source Han Serif" ]; sansSerif = [ - "Source Han Sans SC" - "Noto Sans CJK SC" - "Source Sans 3" - "Noto Sans" + "Source Han Sans" ]; monospace = [ "Maple Mono NF CN"