diff --git a/hosts/darwin/home-default.nix b/hosts/darwin/home-default.nix index 69cbfbf..426890b 100644 --- a/hosts/darwin/home-default.nix +++ b/hosts/darwin/home-default.nix @@ -17,7 +17,7 @@ ../../modules/claude-code.nix ../../modules/tex.nix ../../modules/media/tool.nix - ../../modules/fonts.nix + ../../modules/font/home.nix ../../modules/aerospace.nix ../../modules/peripheral/home.nix ]; diff --git a/hosts/nixos/home-default.nix b/hosts/nixos/home-default.nix index 86bb333..1e2fcbe 100644 --- a/hosts/nixos/home-default.nix +++ b/hosts/nixos/home-default.nix @@ -11,7 +11,7 @@ ../../modules/lazygit.nix ../../modules/rsync.nix ../../modules/btop.nix - ../../modules/fonts.nix + ../../modules/font/home.nix ]; home.username = "yanlin"; diff --git a/config/fonts/fangsong.ttf b/modules/font/fonts/fangsong.ttf similarity index 100% rename from config/fonts/fangsong.ttf rename to modules/font/fonts/fangsong.ttf diff --git a/config/fonts/simsun.ttc b/modules/font/fonts/simsun.ttc similarity index 100% rename from config/fonts/simsun.ttc rename to modules/font/fonts/simsun.ttc diff --git a/config/fonts/xiaobiao_song.TTF b/modules/font/fonts/xiaobiao_song.ttf similarity index 100% rename from config/fonts/xiaobiao_song.TTF rename to modules/font/fonts/xiaobiao_song.ttf diff --git a/modules/fonts.nix b/modules/font/home.nix similarity index 89% rename from modules/fonts.nix rename to modules/font/home.nix index 386f084..d756807 100644 --- a/modules/fonts.nix +++ b/modules/font/home.nix @@ -4,11 +4,11 @@ let # Custom fonts from local files customFonts = pkgs.stdenvNoCC.mkDerivation { name = "custom-fonts"; - src = ../config/fonts; + src = ./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/ \; + find $src -type f \( -iname "*.ttf" -o -iname "*.otf" -o -iname "*.ttc" -o -iname "*.woff" -o -iname "*.woff2" \) -exec cp {} $out/share/fonts/ \; ''; }; in