diff --git a/packages/bitter/package.nix b/packages/bitter/package.nix new file mode 100644 index 0000000..c59efa0 --- /dev/null +++ b/packages/bitter/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: +stdenvNoCC.mkDerivation { + pname = "bitter"; + version = "1.010-unstable-2025-02-12"; + + src = fetchFromGitHub { + owner = "solmatas"; + repo = "BitterPro"; + rev = "3238d7ae2cb0b564b81225d68b3c893a40b1d3ce"; + hash = "sha256-yWUHCob0ExcMIf1NE4Ch49+rTd2uJJPdotUQTWEclK8="; + }; + + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + install -Dm644 -t $out/share/fonts/truetype fonts/variable/*.ttf + runHook postInstall + ''; + + meta = { + license = lib.licenses.ofl; + platform = lib.platforms.all; + }; +} diff --git a/packages/lxgw-neozhisong/package.nix b/packages/lxgw-neozhisong/package.nix new file mode 100644 index 0000000..baa3535 --- /dev/null +++ b/packages/lxgw-neozhisong/package.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lxgw-neozhisong"; + version = "1.032"; + + src = fetchurl { + url = "https://github.com/lxgw/LxgwNeoZhiSong/releases/download/v${finalAttrs.version}/LXGWNeoZhiSong.ttf"; + hash = "sha256-COW12RkXoiKemv5Uq2FshkxkFiLcyWktApCd6Y+vheY="; + }; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + install -Dm644 $src $out/share/fonts/truetype/LXGWNeoZhiSong.ttf + runHook postInstall + ''; + + meta = { + license = lib.licenses.ipa; + platform = lib.platforms.all; + }; +}) diff --git a/users/leah/appearance.nix b/users/leah/appearance.nix index 464f9bd..4f3e13c 100644 --- a/users/leah/appearance.nix +++ b/users/leah/appearance.nix @@ -53,16 +53,18 @@ in iosevka noto-fonts-color-emoji libertinus - i-dot-ming lxgw-neoxihei fontawesome-free manrope + bitter + lxgw-neozhisong ]; fontconfig = { defaultFonts = { serif = [ - "I.Ming" + "Bitter" + "LXGW NeoZhiSong" ]; sansSerif = [ "Manrope"