From d0762ed4c68d816a29fd022f968a913550193d68 Mon Sep 17 00:00:00 2001
From: Denis Knauf <deac+git@denkn.at>
Date: Mon, 10 Jul 2023 19:27:44 +0200
Subject: [PATCH] Lato & Oswald added

---
 fonts.nix | 58 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/fonts.nix b/fonts.nix
index 2e9ca7d..5e61adc 100644
--- a/fonts.nix
+++ b/fonts.nix
@@ -3,47 +3,51 @@
 with pkgs;
 let
 	github = path: "https://github.com/${path}";
+	googlefonts = path: github "/googlefonts/${path}";
 	fonts = {
-		libre_barcode =
-			fetchfont rec {
-				pname = "LibreBarcode";
-				version = "1.008";
-				src = fetchurl { name = "${pname}-${version}.zip";    hash = "sha256-47ntjMcZR4j5ybGU2UAA5t4FTPvyAvTiDSKYGEdRDQU="; url = github "graphicore/librebarcode/releases/download/v${version}/${pname}_v${version}.zip"; };
-			};
-		fira_code =
-			fetchfont rec {
-				pname   = "FiraCode";
-				version = "6.2";
-				src = fetchurl { name = "${pname}-${version}.zip";    hash = "sha256-CUmRW6jrJNif2T0Qp/9iP0KDDXxf/D7L+WDk7K0+Pnk="; url = github "tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; };
-			};
-		fira_mono =
-			fetchfont rec {
-				pname   = "FiraMono";
-				version = "4.202";
-				src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-2GJpZXOH8UTXe6EgERJPMPQj9wZy4VdtwW+Ri7Ft3+Q="; url = github "mozilla/Fira/archive/refs/tags/${version}.tar.gz"; };
-			};
 		alegreya =
 			fetchfont rec {
-				pname   = "Alegreya";
-				version = "2.008";
+				pname   = "Alegreya"; version = "2.008";
 				src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-RNrL48S2DCA7HWDwpV6/bBOYI/g/0jT5sHjs58sVZ24="; url = github "huertatipografica/${pname}/archive/refs/tags/v${version}.tar.gz"; };
 			};
 		alegreya_sans =
 			fetchfont rec {
-				pname = "Alegreya-Sans";
-				version = "2.008";
+				pname = "Alegreya-Sans"; version = "2.008";
 				src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-6lRVctSeGOZ11rcqZ1TaNE4kucrMPSt2wesr+a5zpAI="; url = github "huertatipografica/${pname}/archive/refs/tags/v${version}.tar.gz"; };
 			};
+		fira_code =
+			fetchfont rec {
+				pname   = "FiraCode"; version = "6.2";
+				src = fetchurl { name = "${pname}-${version}.zip";    hash = "sha256-CUmRW6jrJNif2T0Qp/9iP0KDDXxf/D7L+WDk7K0+Pnk="; url = github "tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; };
+			};
+		fira_mono =
+			fetchfont rec {
+				pname   = "FiraMono"; version = "4.202";
+				src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-2GJpZXOH8UTXe6EgERJPMPQj9wZy4VdtwW+Ri7Ft3+Q="; url = github "mozilla/Fira/archive/refs/tags/${version}.tar.gz"; };
+			};
 		inconsolata =
 			fetchfont rec {
-				pname = "Inconsolata";
-				version = "3.000";
-				src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-8tjYumyqeFqWbvF5loIqsUupHsQjQxop4bbEsUvEzaU="; url = github "googlefonts/${pname}/archive/refs/tags/v${version}.tar.gz"; };
+				pname = "Inconsolata"; version = "3.000";
+				src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-8tjYumyqeFqWbvF5loIqsUupHsQjQxop4bbEsUvEzaU="; url = googlefonts "${pname}/archive/refs/tags/v${version}.tar.gz"; };
+			};
+		lato =
+			fetchfont rec {
+        pname = "Lato"; version = "2.000";
+        src = fetchurl { name = "${pname}-${version}.zip";    hash = "sha256-QrVOlsB+KZ2Wf8MifHvWOiDWz7Hcj9ba6DYoCR4gpbg="; url = "https://www.latofonts.com/download/lato2ofl-zip/"; };
+      };
+		libre_barcode =
+			fetchfont rec {
+				pname = "LibreBarcode"; version = "1.008";
+				src = fetchurl { name = "${pname}-${version}.zip";    hash = "sha256-47ntjMcZR4j5ybGU2UAA5t4FTPvyAvTiDSKYGEdRDQU="; url = github "graphicore/librebarcode/releases/download/v${version}/${pname}_v${version}.zip"; };
+			};
+		oswald =
+			fetchfont rec {
+				pname = "Oswald"; version = "4.004";
+				src = fetchurl { name = "${pname}-${version}.tar.gz"; hash = "sha256-XWiMR+0KU76RE7bP4q2urQGYpryqLJayXAEzrT1Gk2Y="; url = googlefonts "OswaldFont/archive/65c0044bd1e113993d193529361f02fa4fd7ad94.tar.gz"; };
 			};
 		rubik_dirt =
 			fetchfont rec {
-				pname = "RubikDirt";
-				version = "2";
+				pname = "RubikDirt"; version = "2";
 				srcs =
 					let baseurl = github "NaN-xyz/Rubik-Filtered/raw/7f47b7f79f903e1d6af9883da43a84928e02b816/dirt/fonts";
 					in [