From 18c8381aee9718313760bafccd0a14207a31a400 Mon Sep 17 00:00:00 2001
From: Baitinq <manuelpalenzuelamerino@gmail.com>
Date: Sun, 29 Dec 2024 19:28:22 +0100
Subject: Font: New font

---
 modules/fonts/berkeley-mono.nix         | 42 ++++++++++++++++++++++++++++++++
 modules/fonts/berkeley-mono/default.nix | 43 ---------------------------------
 modules/fonts/default.nix               |  6 +++--
 modules/fonts/monolisa.nix              | 35 +++++++++++++++++++++++++++
 modules/fonts/tx-02.nix                 | 35 +++++++++++++++++++++++++++
 5 files changed, 116 insertions(+), 45 deletions(-)
 create mode 100644 modules/fonts/berkeley-mono.nix
 delete mode 100644 modules/fonts/berkeley-mono/default.nix
 create mode 100644 modules/fonts/monolisa.nix
 create mode 100644 modules/fonts/tx-02.nix

(limited to 'modules/fonts')

diff --git a/modules/fonts/berkeley-mono.nix b/modules/fonts/berkeley-mono.nix
new file mode 100644
index 0000000..8625abd
--- /dev/null
+++ b/modules/fonts/berkeley-mono.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  requireFile,
+  unzip,
+  stdenvNoCC,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "berkeley-mono";
+  version = "1";
+
+  src = ../../secrets/berkeley-mono.zip;
+
+  outputs = [
+    "out"
+    "web"
+    "variable"
+    "variableweb"
+  ];
+
+  nativeBuildInputs = [
+    unzip
+  ];
+
+  unpackPhase = ''
+    unzip $src
+  '';
+
+  installPhase = ''
+    install -m444 -Dt $out/share/fonts/truetype/berkeley-mono berkeley-mono/TTF/*.ttf
+    install -m444 -Dt $out/share/fonts/opentype/berkeley-mono berkeley-mono/OTF/*.otf
+    install -m444 -Dt $web/share/fonts/webfonts/berkeley-mono berkeley-mono/WEB/*.woff2
+    install -m444 -Dt $variable/share/fonts/truetype/berkeley-mono berkeley-mono-variable/TTF/*.ttf
+    install -m444 -Dt $variableweb/share/fonts/webfonts/berkeley-mono berkeley-mono-variable/WEB/*.woff2
+  '';
+
+  meta = {
+    description = "Berkeley Mono Typeface";
+    homepage = "https://berkeleygraphics.com/typefaces/berkeley-mono";
+    license = lib.licenses.unfree;
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/modules/fonts/berkeley-mono/default.nix b/modules/fonts/berkeley-mono/default.nix
deleted file mode 100644
index 3375217..0000000
--- a/modules/fonts/berkeley-mono/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  requireFile,
-  unzip,
-  stdenvNoCC,
-}:
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "berkeley-mono";
-  version = "1";
-
-  src = ../../../secrets/berkeley-mono.zip;
-
-  outputs = [
-    "out"
-    "web"
-    "variable"
-    "variableweb"
-  ];
-
-  nativeBuildInputs = [
-    unzip
-  ];
-
-  unpackPhase = ''
-    unzip $src
-  '';
-
-  installPhase = ''
-    install -m444 -Dt $out/share/fonts/truetype/berkeley-mono berkeley-mono/TTF/*.ttf
-    install -m444 -Dt $out/share/fonts/opentype/berkeley-mono berkeley-mono/OTF/*.otf
-    install -m444 -Dt $web/share/fonts/webfonts/berkeley-mono berkeley-mono/WEB/*.woff2
-    install -m444 -Dt $variable/share/fonts/truetype/berkeley-mono berkeley-mono-variable/TTF/*.ttf
-    install -m444 -Dt $variableweb/share/fonts/webfonts/berkeley-mono berkeley-mono-variable/WEB/*.woff2
-  '';
-
-  meta = {
-    description = "Berkeley Mono Typeface";
-    longDescription = "…";
-    homepage = "https://berkeleygraphics.com/typefaces/berkeley-mono";
-    license = lib.licenses.unfree;
-    platforms = lib.platforms.all;
-  };
-})
diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix
index 9c4cf45..e3a7086 100644
--- a/modules/fonts/default.nix
+++ b/modules/fonts/default.nix
@@ -6,11 +6,13 @@
       noto-fonts-emoji
       nerd-fonts.inconsolata-lgc
       nerd-fonts.noto
-      (pkgs.callPackage ./berkeley-mono {})
+      (pkgs.callPackage ./berkeley-mono.nix {})
+      (pkgs.callPackage ./tx-02.nix {})
+      (pkgs.callPackage ./monolisa.nix {})
     ];
     fontconfig = {
       defaultFonts = {
-        monospace = [ "Berkeley Mono" "Inconsolata LGC" ];
+        monospace = [ "TX-02" "Inconsolata LGC" ];
       };
     #   localConf = ''
     #   <?xml version="1.0"?>
diff --git a/modules/fonts/monolisa.nix b/modules/fonts/monolisa.nix
new file mode 100644
index 0000000..9ba1917
--- /dev/null
+++ b/modules/fonts/monolisa.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  requireFile,
+  unzip,
+  stdenvNoCC,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "monolisa";
+  version = "1";
+
+  src = ../../secrets/monolisa.zip;
+
+  outputs = [
+    "out"
+  ];
+
+  nativeBuildInputs = [
+    unzip
+  ];
+
+  unpackPhase = ''
+    unzip $src
+  '';
+
+  installPhase = ''
+    install -m444 -Dt $out/share/fonts/opentype/monolisa monolisa/*.ttf
+  '';
+
+  meta = {
+    description = "Monolisa Typeface";
+    homepage = "https://monolisa.dev";
+    license = lib.licenses.unfree;
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/modules/fonts/tx-02.nix b/modules/fonts/tx-02.nix
new file mode 100644
index 0000000..53bceb6
--- /dev/null
+++ b/modules/fonts/tx-02.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  requireFile,
+  unzip,
+  stdenvNoCC,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "tx-02";
+  version = "1";
+
+  src = ../../secrets/tx-02.zip;
+
+  outputs = [
+    "out"
+  ];
+
+  nativeBuildInputs = [
+    unzip
+  ];
+
+  unpackPhase = ''
+    unzip $src
+  '';
+
+  installPhase = ''
+    install -m444 -Dt $out/share/fonts/opentype/tx-02 TX-02/*.otf
+  '';
+
+  meta = {
+    description = "Berkeley Mono TX-02 Typeface";
+    homepage = "https://berkeleygraphics.com/typefaces/berkeley-mono";
+    license = lib.licenses.unfree;
+    platforms = lib.platforms.all;
+  };
+})
-- 
cgit 1.4.1