diff --git a/fonts.nix b/fonts.nix index 7d6c9e7..7634c57 100644 --- a/fonts.nix +++ b/fonts.nix @@ -3,7 +3,7 @@ with pkgs; let github = path: "https://github.com/${path}"; - googlefonts = path: github "/googlefonts/${path}"; + googlefonts = path: github "googlefonts/${path}"; fonts = { alegreya = fetchfont rec { @@ -32,8 +32,31 @@ let }; lato = fetchfont rec { - pname = "Lato"; version = "2.000"; - src = fetchurl { name = "${pname}-${version}.zip"; hash = "sha256-QrVOlsB+KZ2Wf8MifHvWOiDWz7Hcj9ba6DYoCR4gpbg="; url = "https://www.latofonts.com/download/lato2ofl-zip/"; }; + pname = "Lato"; version = "2.015"; + src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-aefWlxXVMcea7HgtbrP6PdgmM+/bZC7bXGZUdJVAE0Y="; url = googlefonts "LatoGFVersion/archive/080cb69711ca050d91e9c866e58df7a73095c69a.tar.gz"; }; + #src = fetchurl { name = "${pname}-${version}.zip"; hash = "sha256-QrVOlsB+KZ2Wf8MifHvWOiDWz7Hcj9ba6DYoCR4gpbg="; url = "https://www.latofonts.com/download/lato2ofl-zip/"; }; + #srcs = + # let baseurl = "https://raw.githubusercontent.com/google/fonts/658d6674d14c20ddb6ccc70288f902f04c2bbdc4/ofl/lato/"; + # # Black BlackItalic ExtraBold ExtraBoldItalic ExtraLight ExtraLightItalic Italic Light LightItalic Medium MediumItalic Regular SemiBold SemiBoldItalic Thin ThinItalic + # list = { + # Black = "0ds31mc8fb11lpc3gx8d3swgiivgcq1pdbw9wrywxnv2kj1n5340"; + # BlackItalic = "1gkcdrnpcqvvibqjg8h8gig7r7k6gj38qcr5pmqsb0v7z5dzf51j"; + # ExtraBold = "15xgd5cbvj9zfz9a7bhrja76qx9hq72m678br150vyfs5gk8s0b1"; + # ExtraBoldItalic = "0x4k109y8vy9l3kckfr7c5vnxlpagz04ffiy09hkm49pki5khax4"; + # ExtraLight = "0vckhw23n3aab3i4cw1n9syffkq2ip81zichgn1g0pfvh6s8k6cq"; + # ExtraLightItalic = "0cfvmf8ppr8j9a1x53xhxjpq86z90c5kallcj3h4rdmra1i54mpw"; + # Italic = "11hprdwwdiwq6156bmlhp18j5lf50147wv6j642i11qkzr7c96g3"; + # Light = "024gg33lw0i85xh2afy1hzq067hf2syng6glhkaiix5s0d2pfang"; + # LightItalic = "0d8nh7kwwp0b1v3n3fkkldjc7m46qha6nyil8rv0x88lzli6f3kh"; + # Medium = "0f5365x82mzdv0xfkx2xac90n708mpxpjmnpbms0bq1kd0m1ib6k"; + # MediumItalic = "01c40i43m0wyk37cxcnlh4afh5fmhmp9symjzrxadn22zb7ydg7c"; + # Regular = "0ldjhpqw0qg4pqlgj0mspp9vz0nh8klqim92lbnk3y9i69lf8dnn"; + # SemiBold = "0g40mzain3afvam5i5kr1d1fkl9b82fm7gk7s8g8hnp7rggbgf3i"; + # SemiBoldItalic = "0p1pa6yyh31cl5lddqg02m1m8gbpaawm5h1v0pprkyyq6jrvdpjs"; + # Thin = "1rymqn0ask06qdi1y871wz1sybkr9nzp78jdykzp10m3x6zmag36"; + # ThinItalic = "1srvlccqs3m64xixlddnc0c7sf1sfmblvnbhahbpp676khhnxs75"; + # }; + # in lib.attrsets.mapAttrsToList (n: h: fetchurl { name = "${pname}-${n}-${version}.ttf"; sha256 = h; url = "${baseurl}${pname}-${n}.ttf"; }) list; }; libre_barcode = fetchfont rec {