diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 78c3fcbbf995..c2788a7193bb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -675,6 +675,12 @@ githubId = 858965; name = "Andrew Morsillo"; }; + an-empty-string = { + name = "Tris Emmy Wilson"; + email = "tris@tris.fyi"; + github = "an-empty-string"; + githubId = 681716; + }; andehen = { email = "git@andehen.net"; github = "andehen"; diff --git a/pkgs/data/fonts/comic-mono/comic-mono-weight.conf b/pkgs/data/fonts/comic-mono/comic-mono-weight.conf new file mode 100644 index 000000000000..97cfa3d83fdf --- /dev/null +++ b/pkgs/data/fonts/comic-mono/comic-mono-weight.conf @@ -0,0 +1,14 @@ + + + + + + + + Comic Mono + + + book + + + diff --git a/pkgs/data/fonts/comic-mono/default.nix b/pkgs/data/fonts/comic-mono/default.nix new file mode 100644 index 000000000000..0c915f21c132 --- /dev/null +++ b/pkgs/data/fonts/comic-mono/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchFromGitHub }: + +let + version = "2020-12-28"; +in fetchFromGitHub { + name = "comic-mono-font-${version}"; + + owner = "dtinth"; + repo = "comic-mono-font"; + rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + + postFetch = '' + mkdir -p $out/share/fonts + tar -z -f $downloadedFile --wildcards -x \*.ttf --one-top-level=$out/share/fonts + + mkdir -p $out/etc/fonts/conf.d + ln -s ${./comic-mono-weight.conf} $out/etc/fonts/conf.d/30-comic-mono.conf + ''; + + hash = "sha256-poMU+WfDZcsyWyFiiXKJ284X22CJlxQIzcJtApnIdAY="; + + meta = with lib; { + description = "A legible monospace font that looks like Comic Sans"; + longDescription = '' + A legible monospace font... the very typeface you’ve been trained to + recognize since childhood. This font is a fork of Shannon Miwa’s Comic + Shanns (version 1). + ''; + homepage = "https://dtinth.github.io/comic-mono-font/"; + + license = licenses.mit; + maintainers = with maintainers; [ an-empty-string totoroot ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 435853d07511..e159156c2f41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23944,6 +23944,8 @@ with pkgs; comfortaa = callPackage ../data/fonts/comfortaa {}; + comic-mono = callPackage ../data/fonts/comic-mono { }; + comic-neue = callPackage ../data/fonts/comic-neue { }; comic-relief = callPackage ../data/fonts/comic-relief {};