diff --git a/custom/unlisted-fonts/flake.nix b/custom/unlisted-fonts/flake.nix index 1198d2b..23bc09d 100644 --- a/custom/unlisted-fonts/flake.nix +++ b/custom/unlisted-fonts/flake.nix @@ -1,53 +1,61 @@ { - description = "A flake giving access to fonts that I use, outside of nixpkgs."; + description = + "A flake giving access to fonts that I use, outside of nixpkgs."; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { - self, - nixpkgs, - flake-utils, - }: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; - in { - defaultPackage = pkgs.symlinkJoin { - name = "myfonts-0.1.4"; - paths = - builtins.attrValues - self.packages.${system}; # Add font derivation names here - }; - - packages.gillsans = pkgs.stdenvNoCC.mkDerivation { - name = "gillsans-font"; - dontConfigue = true; - src = pkgs.fetchzip { - url = "https://freefontsvault.s3.amazonaws.com/2020/02/Gill-Sans-Font-Family.zip"; - sha256 = "sha256-YcZUKzRskiqmEqVcbK/XL6ypsNMbY49qJYFG3yZVF78="; - stripRoot = false; + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = nixpkgs.legacyPackages.${system}; + in { + defaultPackage = pkgs.symlinkJoin { + name = "myfonts-0.1.4"; + paths = builtins.attrValues + self.packages.${system}; # Add font derivation names here }; - installPhase = '' - runHook preInstall - install -Dm644 $src/*.ttf -t $out/share/fonts/opentype - runHook postInstall - ''; - meta = {description = "A Gill Sans Font Family derivation.";}; - }; - packages.palatino = pkgs.stdenvNoCC.mkDerivation { - name = "palatino-font"; - dontConfigue = true; - src = pkgs.fetchzip { - url = "https://www.dfonts.org/wp-content/uploads/fonts/Palatino.zip"; - sha256 = "sha256-FBA8Lj2yJzrBQnazylwUwsFGbCBp1MJ1mdgifaYches="; - stripRoot = false; + packages.gillsans = pkgs.stdenvNoCC.mkDerivation { + name = "gillsans-font"; + dontConfigue = true; + src = pkgs.fetchzip { + url = + "https://freefontsvault.s3.amazonaws.com/2020/02/Gill-Sans-Font-Family.zip"; + sha256 = "sha256-YcZUKzRskiqmEqVcbK/XL6ypsNMbY49qJYFG3yZVF78="; + stripRoot = false; + }; + installPhase = '' + mkdir -p $out/share/fonts + cp -R $src $out/share/fonts/opentype/ + ''; + meta = { description = "A Gill Sans Font Family derivation."; }; }; - installPhase = '' - mkdir -p $out/share/fonts - cp -R $src/Palatino $out/share/fonts/truetype/ - ''; - meta = {description = "The Palatino Font Family derivation.";}; - }; - }); + + packages.palatino = pkgs.stdenvNoCC.mkDerivation { + name = "palatino-font"; + dontConfigue = true; + src = pkgs.fetchzip { + url = + "https://www.dfonts.org/wp-content/uploads/fonts/Palatino.zip"; + sha256 = "sha256-FBA8Lj2yJzrBQnazylwUwsFGbCBp1MJ1mdgifaYches="; + stripRoot = false; + }; + installPhase = '' + mkdir -p $out/share/fonts + cp -R $src/Palatino $out/share/fonts/truetype/ + ''; + meta = { description = "The Palatino Font Family derivation."; }; + }; + packages.monolisa = pkgs.stdenvNoCC.mkDerivation { + name = "monolisa-font"; + dontConfigue = true; + src = ./.; + + installPhase = '' + mkdir -p $out/share/fonts + cp -R $src/fonts/Monolisa $out/share/fonts/truetype + ''; + meta = { description = "The Monolisa Font Family derivation."; }; + }; + }); } diff --git a/system/font.nix b/system/font.nix index 7959fa5..de60d33 100644 --- a/system/font.nix +++ b/system/font.nix @@ -4,11 +4,13 @@ system, ... }: let + unlisted-fonts = inputs.unlisted-fonts.packages.${pkgs.system}; in { fonts.packages = with pkgs; [ - monolisa + unlisted-fonts.gillsans + unlisted-fonts.monolisa nerd-fonts.fira-code nerd-fonts.jetbrains-mono nerd-fonts.iosevka - ]; + ]; }