diff --git a/home/modules/programs/foot/foot.ini b/home/modules/programs/foot/foot.ini index f09e4e6..48d4dbb 100644 --- a/home/modules/programs/foot/foot.ini +++ b/home/modules/programs/foot/foot.ini @@ -8,7 +8,7 @@ term=foot # title=foot # locked-title=no -font=FiraCode Nerd Font:size=15:lang=en-US +# font=FiraCode Nerd Font:size=15:lang=en-US # font-bold= # font-italic= # font-bold-italic= diff --git a/home/modules/programs/ghostty.nix b/home/modules/programs/ghostty.nix index 1dc6d74..ed3dab9 100644 --- a/home/modules/programs/ghostty.nix +++ b/home/modules/programs/ghostty.nix @@ -21,22 +21,35 @@ package = pkgs.ghostty; settings = { # font-family = "FiraCode Nerd Font"; + # font-feature = [ + # "calt=1" + # "clig=1" + # "liga=1" + # "cv01" + # "cv02" + # "cv06" + # "zero" + # "onum" + # "cv17" + # "ss05" + # "ss03" + # "cv16" + # "cv31" + # "cv29" + # "cv30" + # ]; + + # font-family = "Maple Mono SC NF"; font-feature = [ - "calt=1" - "clig=1" - "liga=1" - "cv01" - "cv02" - "cv06" + "calt" "zero" - "onum" - "cv17" + "cv01" + "cv96" + "cv97" + "cv98" + "cv99" "ss05" - "ss03" - "cv16" - "cv31" - "cv29" - "cv30" + "ss08" ]; font-size = lib.mkForce 17; # theme = "ayu"; diff --git a/home/modules/programs/waybar.nix b/home/modules/programs/waybar.nix index aa636c4..fd0f8d7 100644 --- a/home/modules/programs/waybar.nix +++ b/home/modules/programs/waybar.nix @@ -141,7 +141,7 @@ in ]; style = '' * { - font-family: LXGW Wenkai, FiraCode Nerd Font; + font-family: LXGW Wenkai, Maple Mono SC NF; font-weight: bold; font-size: 14px; } diff --git a/nixos/configurations/Tytonidae/stylix.nix b/nixos/configurations/Tytonidae/stylix.nix index 9bff339..c43cc23 100644 --- a/nixos/configurations/Tytonidae/stylix.nix +++ b/nixos/configurations/Tytonidae/stylix.nix @@ -15,8 +15,8 @@ name = "Noto Serif CJK SC"; }; monospace = { - package = pkgs.nerd-fonts.fira-code; - name = "FiraCode Nerd Font"; + package = pkgs.maple-mono-SC-NF; + name = "Maple Mono SC NF"; }; emoji = { package = pkgs.noto-fonts-emoji; diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index 70b023c..0dc59fd 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -38,6 +38,7 @@ in enableDefaultPackages = false; packages = with pkgs; [ nerd-fonts.fira-code + maple-mono-SC-NF noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif @@ -55,7 +56,7 @@ in "Noto Serif" ]; monospace = [ - "FiraCode Nerd Font" + "Maple Mono SC NF" ]; emoji = [ "Noto Color Emoji" ]; };