From e9119643c6ae4078a9003af10083b22d6e046dc5 Mon Sep 17 00:00:00 2001
From: "Reid \"reidlab" <reidlab325@gmail.com>
Date: Wed, 13 Nov 2024 10:06:15 -0800
Subject: [PATCH] atkinson hyperlegible -> lexica ultralegible

---
 config/nwg-drawer.css                              |  2 +-
 modules/desktop/fonts.nix                          |  8 ++++----
 modules/desktop/themes/catppuccin/waybar.css       |  3 +--
 .../default.nix                                    | 14 ++++++++------
 4 files changed, 14 insertions(+), 13 deletions(-)
 rename packages/{atkinson-hyperlegible-pro => lexica-ultralegible}/default.nix (50%)

diff --git a/config/nwg-drawer.css b/config/nwg-drawer.css
index 278521a..ece6db5 100644
--- a/config/nwg-drawer.css
+++ b/config/nwg-drawer.css
@@ -2,7 +2,7 @@ window {
   /*background: @base;*/
   background: alpha(@base, 0.3);
   color: @text;
-  font-family: 'Atkinson Hyperlegible Pro', 'Atkinson Hyperlegible', FontAwesome, Noto Sans CJK;
+  font-family: 'Lexica Ultralegible', 'Atkinson Hyperlegible', FontAwesome, Noto Sans CJK;
   font-size: 14px;
   font-style: normal;
 }
diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix
index 8bd66f0..e83d200 100644
--- a/modules/desktop/fonts.nix
+++ b/modules/desktop/fonts.nix
@@ -30,14 +30,14 @@ in {
     
     fonts = {
       sansSerif = mkFontOption "sansSerif" {
-        package = pkgs.my.atkinson-hyperlegible-pro;
-        family = "Atkinson Hyperlegible Pro";
+        package = pkgs.my.lexica-ultralegible;
+        family = "Lexica Ultralegible";
 
         size = 11;
       };
       serif = mkFontOption "serif" {
-        package = pkgs.my.atkinson-hyperlegible-pro;
-        family = "Atkinson Hyperlegible Pro";
+        package = pkgs.my.lexica-ultralegible;
+        family = "Lexica Ultralegible";
 
         size = 11;
       };
diff --git a/modules/desktop/themes/catppuccin/waybar.css b/modules/desktop/themes/catppuccin/waybar.css
index d805dd0..2ebdb07 100644
--- a/modules/desktop/themes/catppuccin/waybar.css
+++ b/modules/desktop/themes/catppuccin/waybar.css
@@ -13,8 +13,7 @@ window#waybar {
   /*background: alpha(@base, 0.6);*/
   background: @base;
   border-radius: 1em;
-  /*font-family: VictorMono, Iosevka Nerd Font, Noto Sans CJK;*/
-  /*font-family: 'Atkinson Hyperlegible', FontAwesome, Noto Sans CJK;*/
+  /*font-family: 'Lexica Ultralegible', 'Atkinson Hyperlegible', FontAwesome, Noto Sans CJK;*/
   font-family: CozetteVector, monospace, FontAwesome, Noto Sans CJK;
   font-size: 13px;
   font-style: normal;
diff --git a/packages/atkinson-hyperlegible-pro/default.nix b/packages/lexica-ultralegible/default.nix
similarity index 50%
rename from packages/atkinson-hyperlegible-pro/default.nix
rename to packages/lexica-ultralegible/default.nix
index 0301b75..2248ecc 100644
--- a/packages/atkinson-hyperlegible-pro/default.nix
+++ b/packages/lexica-ultralegible/default.nix
@@ -1,27 +1,29 @@
 { lib, stdenvNoCC, fetchFromGitHub }:
 
 stdenvNoCC.mkDerivation {
-  pname = "atkinson-hyperlegible-pro";
-  version = "1.5.1-unstable";
+  pname = "lexica-ultralegible";
+  version = "1.0.0-unstable";
 
   src = fetchFromGitHub {
     owner = "jacobxperez";
-    repo = "atkinson-hyperlegible-pro";
-    rev = "2576e71d09f57eac8d5e7d9d42b9e7ce49f759e1";
-    hash = "sha256-Zqr4dwrT/QWpYlNlLCVnWaZ6B5+yQ4Zh5pqYa7NBg3Y=";
+    repo = "lexica-ultralegible";
+    rev = "109729403ce6f5d9d74c6c6d8debc3380f3e3c10";
+    hash = "sha256-+mHIsmj2TL/sUVxUBsIqTK6D6GLgK4DgaiU9PTkgmUA=";
   };
 
   installPhase = ''
     runHook preInstall
 
     install -Dm644 -t $out/share/fonts/opentype fonts/otf/*
+    install -Dm644 -t $out/share/fonts/truetype fonts/ttf/*
+    install -Dm644 -t $out/share/fonts/woff2 fonts/web/*
 
     runHook postInstall
   '';
 
   meta = with lib; {
     description = "Maintained version of Atkinson Hyperlegible";
-    homepage = "https://jacobxperez.github.io/atkinson-hyperlegible-pro/";
+    homepage = "https://jacobxperez.github.io/lexica-ultralegible/";
     license = licenses.ofl;
     platforms = platforms.all;
   };