From 309c8079e8bae2dfc7ffd62f05fa86fd476e19e3 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 26 Nov 2024 20:11:39 -0500
Subject: [PATCH] packages: use aleo-fonts from nixpkgs

---
 modules/fonts.nix       | 32 +++++++++++++-------------------
 modules/stylix.nix      |  4 +---
 packages/aleo-fonts.nix | 33 ---------------------------------
 3 files changed, 14 insertions(+), 55 deletions(-)
 delete mode 100644 packages/aleo-fonts.nix

diff --git a/modules/fonts.nix b/modules/fonts.nix
index a9eb5006..25f88d9c 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -1,27 +1,21 @@
-{ nix-config, pkgs, ... }:
+{ pkgs, ... }:
 
-let
-  inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
-in
 {
   fonts = {
     enableDefaultPackages = false;
 
-    packages =
-      [
-        aleo-fonts
-      ]
-      ++ (with pkgs; [
-        noto-fonts
-        noto-fonts-cjk-serif
-        noto-fonts-cjk-sans
-        noto-fonts-emoji
-        maple-mono
-        font-awesome
-        (nerdfonts.override { fonts = [ "Noto" ]; })
-        kanji-stroke-order-font
-        liberation_ttf
-      ]);
+    packages = with pkgs; [
+      aleo-fonts
+      noto-fonts
+      noto-fonts-cjk-serif
+      noto-fonts-cjk-sans
+      noto-fonts-emoji
+      maple-mono
+      font-awesome
+      (nerdfonts.override { fonts = [ "Noto" ]; })
+      kanji-stroke-order-font
+      liberation_ttf
+    ];
 
     fontconfig = {
       defaultFonts = {
diff --git a/modules/stylix.nix b/modules/stylix.nix
index 66a662b3..a4523ae1 100644
--- a/modules/stylix.nix
+++ b/modules/stylix.nix
@@ -6,8 +6,6 @@
 }:
 
 let
-  inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
-
   stylix-background = nix-config.packages.${pkgs.system}.stylix-background.override {
     color = config.lib.stylix.colors.base00;
   };
@@ -62,7 +60,7 @@ in
 
     fonts = {
       serif = {
-        package = aleo-fonts;
+        package = pkgs.aleo-fonts;
         name = "Aleo";
       };
 
diff --git a/packages/aleo-fonts.nix b/packages/aleo-fonts.nix
deleted file mode 100644
index 54a2e224..00000000
--- a/packages/aleo-fonts.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-}:
-
-stdenvNoCC.mkDerivation {
-  pname = "aleo-fonts";
-  version = "2.0.0-unstable-2023-06-03";
-
-  src = fetchFromGitHub {
-    owner = "AlessioLaiso";
-    repo = "aleo";
-    rev = "ce875e48d9983031648e87f38b7a269f4fbf5eb5";
-    hash = "sha256-HSxP5/sLHQTujBVt1u93625EXEc42lxpt8W1//6ngWM=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 fonts/variable/*.ttf -t $out/share/fonts/truetype/AleoFonts
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Slab serif typeface designed by Alessio Laiso";
-    homepage = "https://github.com/AlessioLaiso/aleo";
-    license = lib.licenses.ofl;
-    maintainers = with lib.maintainers; [ donovanglover ];
-    platforms = lib.platforms.all;
-  };
-}