From e21cf632161ba2575135b79f669159b791c6ef9a Mon Sep 17 00:00:00 2001 From: biscuit Date: Tue, 20 May 2025 22:55:43 -0500 Subject: [PATCH] upd --- custom/unlisted-fonts/flake.nix | 16 +++++++++------- flake.lock | 16 ++++++---------- system/font.nix | 4 +++- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/custom/unlisted-fonts/flake.nix b/custom/unlisted-fonts/flake.nix index 2d0fbd8..60207af 100644 --- a/custom/unlisted-fonts/flake.nix +++ b/custom/unlisted-fonts/flake.nix @@ -20,14 +20,16 @@ packages.monolisa = pkgs.stdenvNoCC.mkDerivation { name = "monolisa-font"; - dontConfigure = true; - src = builtins.toPath ./fonts; + src = builtins.toPath ./fonts/Monolisa; + dontUnpack = true; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + find $src -type f -name "*.ttf" -exec cp {} $out/share/fonts/truetype/ \; + ''; + + meta = {description = "Monolisa font.";}; }; - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -R $src/Moonolisa/*.ttf $out/share/fonts/truetype - ''; - meta = {description = "Monolisa font.";}; } ); } diff --git a/flake.lock b/flake.lock index aa3fae8..ac431f4 100644 --- a/flake.lock +++ b/flake.lock @@ -88,18 +88,14 @@ ] }, "locked": { - "lastModified": 1719659382, - "narHash": "sha256-fJIgQZ4NI9mLJcT+cBk++gnSzFwxrHtIwb35RXk+bE0=", - "owner": "mykhalskyio", - "repo": "monolisa-flake", - "rev": "6e2a552bb64e54d41d3b19e7072fb675a7efdad8", - "type": "github" + "path": "./custom/unlisted-fonts/", + "type": "path" }, "original": { - "owner": "mykhalskyio", - "repo": "monolisa-flake", - "type": "github" - } + "path": "./custom/unlisted-fonts/", + "type": "path" + }, + "parent": [] }, "nixpkgs": { "locked": { diff --git a/system/font.nix b/system/font.nix index 968e4f2..51586b5 100644 --- a/system/font.nix +++ b/system/font.nix @@ -4,7 +4,9 @@ system, ... }: { - + environment.systemPackages = with pkgs; [ + inputs.monolisa.packages.${system}.monolisa + ]; fonts.packages = with pkgs; [ nerd-fonts.fira-code nerd-fonts.jetbrains-mono