From d5304bbe2b3822ed86e4081c53562f5bf46b3a3e Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sat, 23 Dec 2023 00:07:03 +0100
Subject: [PATCH] feat: make virtiofsd tags short and friendly to not upset the
 software with oh-so-bad long strings with underscores

---
 flake.lock                           |   6 +++---
 hosts/sentinel/secrets/local.nix.age | Bin 747 -> 846 bytes
 modules/guests/microvm.nix           |   2 +-
 modules/promtail.nix                 |   3 ++-
 modules/telegraf.nix                 |   3 ++-
 nix/generate-installer-package.nix   |   2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index b4cbd30..3866803 100644
--- a/flake.lock
+++ b/flake.lock
@@ -405,11 +405,11 @@
         "pre-commit-hooks": "pre-commit-hooks_3"
       },
       "locked": {
-        "lastModified": 1703273523,
-        "narHash": "sha256-YG/KXGLR4wkiJidX8MtunXOlSsR8tgqwkfQnS3Xe1Jk=",
+        "lastModified": 1703274528,
+        "narHash": "sha256-r5y1DmRxlKF3rlJoIULeq1lGVGWbTZxmNGlQ0jW8ZjQ=",
         "owner": "oddlama",
         "repo": "nixos-extra-modules",
-        "rev": "5072dd354d2dd3bfead36c9269c34ed00d0f3fdd",
+        "rev": "f4a871a401059ff0662ef86a059742d47d45a5bc",
         "type": "github"
       },
       "original": {
diff --git a/hosts/sentinel/secrets/local.nix.age b/hosts/sentinel/secrets/local.nix.age
index acf8c42481b310f7ee2813d8cb4130da9970b0b9..16aa17fac3f56f9fa677a4d61a15afb13e35c69f 100644
GIT binary patch
delta 827
zcmV-B1H}C61<nSLAb(hRWK~xyY-cz)SV&k{OLA0eHdabDPf~egRdz3Lcw<I$Rx5a6
zaaCGpcM3CWNK{irHE~CGaxhJ8T6j)RH%4SvcyU8CZ%jmSNn<u|OG;N-cri9-RSGRW
zAaH4REpRe5HXwL$Q)M_&AVDivb#ZQ0FnLsHc``^abyY`XMSo3jOGj8pM0q%EOhs@}
zcvUc1PeM3uFn9`BHBwSxVog{}Ra#_td2?uFNM~wPSz&K_c1~GjD^qGvbSq_3G%-U<
zYDEeyJ|JmwYBgppXL4m>b7de^a5iiteQiG=J|r$YOhPkNAZRdoVIWCgFJ(0^3U*{K
za(HD#GeI*_M1OQSMK5nPPgXKZQb=QFbwy2cRa!YlNLg`AbXs_JGF5j=Sw?JQN?}uN
zVNx|zcW7ocIZz5vR7EsFNKSB0P;N;!Hc?4sO*JxPM0agNT2gglGC@L3H#2HaGH-Wx
zYEWZgO;2xkNOw4Rb9GQFOK%D-EiE8sZ8ubCX)sbRWq)j0S!QNgMM`ojbxuY$PE=1;
zXHr;eSW$XwW=&IiaBWQrs7ptKrgU>beqZPk-YR}H(QPbjL|p62L7g*)M=D<@;fu^!
zxS#h)tC_dNo|M{EYh8a5Y(34;<o3OF4L1cwdIX4LK@jy!U%`o>pn)<RBw!+T(4lVL
zVDnoa2Y+Og2FjWrYY2d*Meov7?x&m5iOi!&3|Z-W38hU}_p2#4UF!^PWZsd`?TI-v
zu0bYtA|aOJUO}$I94@IYa&kzr!c2519V_EQ;WNmB_tY*@U_B5zf=wU(nI>2Leaxh6
z##@37Qh;mn%gM8#Au^mq!|yJ%*6S$waYE{Y(tlB(3|){b09?`|Ti24AJJwdhGI*~O
zq5V3<lic#<Rb?;EV0#85#qW@5b1}y^woXaMH=h3?t65ioupI*}xw(qQb#MZFhBCE`
zC-;Nzd`2;Mex^Mcyps&0rT}#0^X2^Tj*4*x(a~d=9x{v!Z_u}E+deRxt)L$RzjVIZ
zkTn1L0rvr*Y=`L9>fADGF4HxN_Gb%LHezp00bF6D0xeTU+Zz*72l>KUz0p^@rT3gK
FUbW@AP4WN$

delta 727
zcmV;|0x12?2I~coAb(U$b3{3CD|BsoM=w=bZ#7hJFhf}~Z%ILIV|a8~NOwy{Y;bI9
zQ)+22Q3_c_L3CAVWqB)5VMHrTL~J%|bx1fwLS|4+aBFZ>OEOMHR%K*KNlkV_YYHts
zAaH4REpRe5HXwL$Q)M_&AVD`oS1?#{ZdWlYQ&Lq*V_G(COn+EwX?apmFi?1GSTRa@
zZbwFIGBI^IXmbizMqxHnM|pQwQdmZBa%N~|SSw<9H86NHXhm~2RdsY>S2RIQS2cE5
zPh$!#J|JUiRwqX-XL4m>b7dfEZBI&6AaN>rAY61sEedQ}GDLWBH)nETN_I$ecVtUz
zOfg4rPHIGFO@BsWZA4CNaB)jkK}BImL@RVLX9_JXEg(*4bW(C+Filifc4#p#F*0Rh
zGb=Q9F?mr=D>X%NVp?)UO=VU=F;GNUFbZdkwcI<3Q{GVc4r7hElnVf>wPcy|R0^Vx
z(o+hq*q15eMcRw_G5fJPlG!6df_;Oy7<QC<9yWMJ!G9xkii8#V_i5+Uvb-t|6JeQ7
zee}EI#wOAECGu+RQb9%eJ}<FGyTK~<kW`2}BUrnY3nieztZOw2Wy)72deul4eUBhG
z)D^L{e$_66W$&Ou>f(Sc7j%YLv6pj5k-w%v38CK?;p=#_0u>d;pGbu(XfScq=7(`f
z>DCboMSr!YXXv3@i#b?+y!xxLv33s?<>3&RC9^zff)^v0yEfX6zmI7A&2Cg<<4jI2
z9I=M&8EW$)4=tCrieNES|EUW39T8D{4y#^UxVsqF&N)y+*=<_6rgu8Fn)o>ZACAX1
z;5cmIuqm;G??4t*`ThcsL!Wbm7R`7jS$!2y{7?d$$9(*^UIW7|CiLi8&kIQ_zi^S5
z|Iqp_+frmB#gQPu^S)sW%9Y0i4_7vXAn>c!249eDOyVqhj6)~wxPv?D^=c9w;{yIn
Jl`h06G5PjDEQbI9

diff --git a/modules/guests/microvm.nix b/modules/guests/microvm.nix
index 25aa2d9..b7b7d74 100644
--- a/modules/guests/microvm.nix
+++ b/modules/guests/microvm.nix
@@ -71,7 +71,7 @@ in {
           _: zfsCfg: {
             source = zfsCfg.hostMountpoint;
             mountPoint = zfsCfg.guestMountpoint;
-            tag = lib.replaceStrings ["/"] ["_"] zfsCfg.hostMountpoint;
+            tag = builtins.substring 0 16 (builtins.hashString "sha256" zfsCfg.hostMountpoint);
             proto = "virtiofs";
           }
         );
diff --git a/modules/promtail.nix b/modules/promtail.nix
index fee1072..6a4deab 100644
--- a/modules/promtail.nix
+++ b/modules/promtail.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  minimal,
   nodes,
   ...
 }: let
@@ -23,7 +24,7 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (!minimal && cfg.enable) {
     age.secrets.promtail-loki-basic-auth-password = {
       generator.script = "alnum";
       mode = "440";
diff --git a/modules/telegraf.nix b/modules/telegraf.nix
index cb4271e..eccc9ad 100644
--- a/modules/telegraf.nix
+++ b/modules/telegraf.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  minimal,
   nodes,
   pkgs,
   ...
@@ -56,7 +57,7 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (!minimal && cfg.enable) {
     nodes.${cfg.influxdb2.node} = {
       # Mirror the original secret on the influx host
       age.secrets."telegraf-influxdb-token-${config.node.name}" = {
diff --git a/nix/generate-installer-package.nix b/nix/generate-installer-package.nix
index 8158990..30c5efd 100644
--- a/nix/generate-installer-package.nix
+++ b/nix/generate-installer-package.nix
@@ -20,7 +20,7 @@
 
   installer-package = pkgs.symlinkJoin {
     name = "installer-package-${nodeName}";
-    paths = with pkgs; [
+    paths = [
       disko-script
       disko-mount
       disko-format