From 8e4e80124473042a97399f2569f1bc848e8a839a Mon Sep 17 00:00:00 2001
From: Bernardo Magri <bernardo@bernardomagri.eu>
Date: Mon, 13 Apr 2026 12:34:15 +0100
Subject: [PATCH] fix: rename and track Nomarchy.ttf font for flake build

---
 core/home/config/Nomarchy.ttf                    | Bin 0 -> 1224 bytes
 core/home/config/nomarchy.ttf                    | Bin 1516 -> 0 bytes
 core/system/fonts.nix                            |   8 +++++---
 .../waybar/themes/summer-night/config.jsonc      |   2 +-
 .../desktop/waybar/themes/summer-night/style.css |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 core/home/config/Nomarchy.ttf
 delete mode 100644 core/home/config/nomarchy.ttf

diff --git a/core/home/config/Nomarchy.ttf b/core/home/config/Nomarchy.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4bb999d666d66ad6822ab86b931e4f73c95bdd56
GIT binary patch
literal 1224
zcmah|T}YEr7=F%oHg!7Pw2=fOCO9k-e-g653(X)1Q8Dr7D!*)Q(&mPnppYR+6hY}#
z(PiOXU3gV?5$q;G=qe@1LI$El-bi3~?&~>c-xv$31Lr%>^PczTIqx|i1b|8`K%&39
zuV(<KaSm{-&|2T!-_`RK+ds&c$!q$qH=p;^xIY78gnVo~W+pN|?-%kd^1-l~OmOwm
z{~_11aCB}W@$Ah4V04gwkA%!y&5mm?h`(`Oh|o~_Qm!-JM_wO^rDiL4<rw)Ixjz~o
zH?e|Wj6Xx}i<z?tRN*A|FOmnQ%vk8{!EhZQ>uI}^h$mA#2Ztk~_My(kdG*2O`x~B)
zBUCulCiacRn!;+OWk#mS%U~!g2V-Q~N;8k9GNUtTY=4~E;)2h1$wwA^q<k%w;iUHG
z#z&f$a;rE%n{XA}G!krC@#q8&a~e9SjjTvPfSg0AQ&SbEMh@YIGzJy5r=M{O`}tMf
z@H0U5u3Vp11y&+(2+JZWU|}6uyIx08P3@pREx3#U+(b$hx4Y+ri<wRU)wR{_wN95P
z6+zMN5)IX*4Z)4B``MIm8C&m;_r-_f)-~glC|~bd6pxI}`Ru*m$et0+w#CGVM{L~A
zzRJ$di#x&LJ$+^?EtZT;)yG_Bohu)v<Ot!me#(r|sLrYC3b!s~H0qS<{9@GDl8<xy
z?ZWt!Q!uKFL9kz|a)(`JjiA;mceJ?GybM-x<Eh;Z!Oqp$*gz>R*;vxvYhwrhfx9+#
zqC%-uQc*&m33U?=7cE|#wXwlh-DzV<`;d(t2;hm0oqYEdHZGyh)KF+TIT@b{v^KRc
zAcScoF^M>)7}Sa;wDiVf=Ja@Ej<Vv2!KBAHBA6Qpg=eDXH19BkFlG={TYq!@pFNPz
v_D2zlD9TUe{~iK@uh2s$BHgblV0(Kz_cB%g$o2o0d-l97_7l7T_2=R@(=X2_

literal 0
HcmV?d00001

diff --git a/core/home/config/nomarchy.ttf b/core/home/config/nomarchy.ttf
deleted file mode 100644
index e025e2cbe75b400b2f0728a5e18e66f24fbf5b37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1516
zcmc&!OH30{6g_XIKihy{1!90W3+e~8r4=P1erQyhxKM(zU}9p1c7_%^oyl}Sx-l#u
z!G)iNap%Isg$ol`#<-G&Zj2_HXk7T&Au+}U3*(C7ebZMW6;~{LllShq=iYbUd3PoQ
z1|WzT$WYFnizU*JGY0{-huCz+P%YeMSID2Id3wB1)}Mbnb_b9?QQXOCYBpNg`GN2o
znul{l1kQM5!VhV7<qT&!K!Enn&=M$^85RB9m)_ChGt_B|HG$4zJWVO8hW7UU`yN0Z
zq8!6AOAf_pco%5d3)1T0?nQTnyv&((Lvk5n2k&0EcWLX9p9ocR7k?QB&#YN_+2sR}
z#C~2$LPzxgmkm;1fYn;u19l5u1f*-yE8=ceE&GlHS1-ZK@4dko(obbEfFzQCYOg8h
zTvZ{x0lGNN4iP&^9#_RRQIFsw%Uos2)v7Ajt}fJSQ6GJjx7ktO)6LfVKl}N2<~G)S
z(|$A{jCLTry`4pN`<vTZ8<?L(dixHM>D|G+ZGGWp#@O|_<cS09D9b-xSz<5P%F+}0
zV`Xx7fXU%_<w0d?aWulNc6Yw~YOv9*jjF}YUtYNpXCrKWaU@ci<#*kNFKch4h5Twi
z83Je#Sb`s&0?WjA3G5-fUtljn=oQ#U{BePU*oTzBA-a>zzY@<DI;R_R0y8w>k-!of
z@l0Tu_}2n^2!9sXi&p#)*oP)23min6g#`{_7t5!#qGqd(mQ}{eN~%z{a*k#fO+&Ra
zx$>|!K3P!L+!~$M>{8w=D)DGfjapZxG&P=Z99_|E(@+M@qN5cGrefLVgqCrlImfa3
zV=-Ou(Tr)(^)(b}+EC$;%|gK#%Cx3XAZsD#@-}6eFeuALhPX0@DSI4~l*PIFXuY3y
z&nO{JRf<$SjwpKm+VyWWB}~z23DV*~r~Nve$@M50bSrZ01$s<kEH^emOop<f?hPDb
b`w^o@ugi~87OzC3_W$Dls*MK4naKGKmA=h5

diff --git a/core/system/fonts.nix b/core/system/fonts.nix
index 5c553ae..bf89414 100644
--- a/core/system/fonts.nix
+++ b/core/system/fonts.nix
@@ -4,11 +4,13 @@ let
   nomarchy-font = pkgs.stdenv.mkDerivation {
     pname = "nomarchy-font";
     version = "1.0";
-    # Pull from core/home/config where the ttf is located
-    src = ./../home/config; 
+    # Point directly to the font file
+    src = ./../home/config/Nomarchy.ttf;
+    # No archive to unpack
+    unpackPhase = "true";
     installPhase = ''
       mkdir -p $out/share/fonts/truetype
-      cp nomarchy.ttf $out/share/fonts/truetype/
+      cp $src $out/share/fonts/truetype/Nomarchy.ttf
     '';
   };
 in
diff --git a/features/desktop/waybar/themes/summer-night/config.jsonc b/features/desktop/waybar/themes/summer-night/config.jsonc
index fa0b5d9..b70d4e5 100644
--- a/features/desktop/waybar/themes/summer-night/config.jsonc
+++ b/features/desktop/waybar/themes/summer-night/config.jsonc
@@ -38,7 +38,7 @@
   
   "custom/nomarchy": {
       "interval": "once",
-      "format": "<span font='nomarchy'>a</span>",
+      "format": "\uf000",
       "on-click": "nomarchy-menu",
       "tooltip-format": "Application Launcher"
     },
diff --git a/features/desktop/waybar/themes/summer-night/style.css b/features/desktop/waybar/themes/summer-night/style.css
index c3f36ee..1c2f39a 100644
--- a/features/desktop/waybar/themes/summer-night/style.css
+++ b/features/desktop/waybar/themes/summer-night/style.css
@@ -28,7 +28,7 @@
 /* Spacing inside the element */
 
 * {
-  font-family: JetBrainsMono Nerd Font, FontAwesome;
+  font-family: JetBrainsMono Nerd Font, FontAwesome, Nomarchy;
   font-size: 13px;
   font-weight: bold;
 }