diff --git a/config/fonts/fangsong.ttf b/config/fonts/fangsong.ttf new file mode 100644 index 0000000..16eb427 Binary files /dev/null and b/config/fonts/fangsong.ttf differ diff --git a/modules/fonts.nix b/modules/fonts.nix index 6efdbc0..4010ec2 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,5 +1,17 @@ { pkgs, ... }: +let + # Custom fonts from local files + customFonts = pkgs.stdenvNoCC.mkDerivation { + name = "custom-fonts"; + src = ../config/fonts; + + installPhase = '' + mkdir -p $out/share/fonts + find $src -type f \( -name "*.ttf" -o -name "*.otf" -o -name "*.ttc" -o -name "*.woff" -o -name "*.woff2" \) -exec cp {} $out/share/fonts/ \; + ''; + }; +in { # Font packages home.packages = with pkgs; [ @@ -22,6 +34,9 @@ arphic-ukai # KaiTi style (楷体) - brush stroke style arphic-uming # MingTi/Song style (宋体) - serif style wqy_zenhei # WenQuanYi Zen Hei - popular sans-serif with good coverage + + # Custom fonts from config/fonts directory + customFonts ]; # Enable font configuration diff --git a/modules/keyboard-toggle.nix b/modules/keyboard-toggle.nix index e3600e1..3ad4391 100644 --- a/modules/keyboard-toggle.nix +++ b/modules/keyboard-toggle.nix @@ -38,7 +38,6 @@ in main = { capslock = "leftcontrol"; leftalt = "leftmeta"; - leftmeta = "leftalt"; }; }; };