wip: remove very specific special args and unify library functions

hosts/ward/default.nix

@@ -1,12 +1,12 @@
 {
+  inputs,
   config,
-  nixos-hardware,
   nodes,
   ...
 }: {
   imports = [
-    nixos-hardware.common-cpu-intel
-    nixos-hardware.common-pc-ssd
+    inputs.nixos-hardware.nixosModules.common-cpu-intel
+    inputs.nixos-hardware.nixosModules.common-pc-ssd
     ../../modules/optional/hardware/intel.nix
     ../../modules/optional/hardware/physical.nix
 
@@ -50,6 +50,13 @@
         enable = true;
         pool = "rpool";
       };
+      todo
+      configPath =
+        if nodePath != null && builtins.pathExists (nodePath + "/microvms/${name}") then
+        nodePath + "/microvms/${name}"
+        else if nodePath != null && builtins.pathExists (nodePath + "/microvms/${name}") then
+        nodePath + "/microvms/${name}.nix"
+        else null;
     };
   in {
     kanidm = defaults;

hosts/ward/fs.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  extraLib,
   pkgs,
   ...
 }: {
@@ -10,7 +9,7 @@
       m2-ssd = {
         type = "disk";
         device = "/dev/disk/by-id/${config.repo.secrets.local.disk.m2-ssd}";
-        content = with extraLib.disko.gpt; {
+        content = with config.lib.disko.gpt; {
           type = "table";
           format = "gpt";
           partitions = [
@@ -21,7 +20,7 @@
         };
       };
     };
-    zpool = with extraLib.disko.zfs; {
+    zpool = with config.lib.disko.zfs; {
       rpool =
         defaultZpoolOptions
         // {
@@ -34,20 +33,5 @@
     };
   };
 
-  # TODO remove once this is upstreamed
-  boot.initrd.systemd.services."zfs-import-rpool".after = ["cryptsetup.target"];
-  fileSystems."/state".neededForBoot = true;
-  fileSystems."/persist".neededForBoot = true;
-
-  # After importing the rpool, rollback the root system to be empty.
-  boot.initrd.systemd.services.impermanence-root = {
-    wantedBy = ["initrd.target"];
-    after = ["zfs-import-rpool.service"];
-    before = ["sysroot.mount"];
-    unitConfig.DefaultDependencies = "no";
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.zfs}/bin/zfs rollback -r rpool/local/root@blank";
-    };
-  };
+  boot.initrd.luks.devices.enc-rpool.allowDiscards = true;
 }

hosts/ward/microvms/grafana/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  nodeName,
   nodes,
   utils,
   ...
@@ -123,7 +122,7 @@ in {
           url = "https://${sentinelCfg.networking.providedDomains.loki}";
           orgId = 1;
           basicAuth = true;
-          basicAuthUser = "${nodeName}+grafana-loki-basic-auth-password";
+          basicAuthUser = "${config.repo.node.name}+grafana-loki-basic-auth-password";
           secureJsonData.basicAuthPassword = "$__file{${config.age.secrets.grafana-loki-basic-auth-password.path}}";
         }
       ];