feat: add disko soil

flake.nix

@@ -17,7 +17,7 @@
     nixgl.url = "github:guibou/nixGL";
     nixgl.inputs.nixpkgs.follows = "nixpkgs";
     nixgl.inputs.flake-utils.follows = "std/flake-utils";
-    disko.url = "github:blaggacao/disko/module";
+    disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs";
     nixos-hardware.url = "github:nixos/nixos-hardware";
   };
@@ -60,6 +60,7 @@
         (data "nixosConfigurations")
         (data "colmenaConfigurations")
         (data "homeConfigurations")
+        (data "diskoConfigurations")
 
         # devshells can be entered
         (devshells "devshells")
@@ -106,6 +107,15 @@
         };
       in
         makeMoonshineFrom self;
+
+      # tool: disko -- "Tiganizatia, tiganizatia - disko, disko partizani."
+      diskoConfigurations = let
+        makeShantyFrom = import ./make-shanty.nix {
+          inherit (inputs) nixpkgs;
+          cellBlock = "diskoConfigurations";
+        };
+      in
+        makeShantyFrom self;
     };
 
   # --- Flake Local Nix Configuration ----------------------------

make-shanty.nix

@@ -0,0 +1,8 @@
+{
+  nixpkgs,
+  cellBlock ? "diskoConfigurations",
+}: let
+  l = nixpkgs.lib // builtins;
+  inherit (import ./pasteurize.nix {inherit nixpkgs cellBlock;}) sing;
+in
+  sing

pasteurize.nix

@@ -94,11 +94,7 @@
       then throw "\nFailed assertions:\n${l.concatStringsSep "\n" (map (x: "- ${x}") failedAsserts)}"
       else checked;
   in
-    (l.removeAttrs config ["_hive_erased" "bee"])
-    // {
-      inherit _file;
-    }
-    // (out asserted);
+    locatedConfig // (out asserted);
 
   /*
 
@@ -197,6 +193,24 @@
     # system = config.bee.system; # not actually used
   };
 
+  # same as pasteurize, but for disko where the system doesn't matter
+  sing = self:
+    l.pipe
+    (
+      l.mapAttrs (system:
+        l.mapAttrs (user: blocks: (
+          l.pipe blocks [
+            (l.attrByPath [cellBlock] {})
+            (l.filterAttrs (_: _: "x86_64-linux" == system)) # pick one
+            (l.mapAttrs (disko: l.nameValuePair "${user}-o-${disko}"))
+          ]
+        )))
+      (l.intersectAttrs (l.genAttrs l.systems.doubles.all (_: null)) self)
+    ) [
+      (l.collect (x: x ? name && x ? value))
+      l.listToAttrs
+    ];
+
   # Error reporting
   showAssertions = let
     collectFailed = cfg:
@@ -216,4 +230,4 @@
           then evaled
           else throw "\nFailed assertions:\n${failedStr}"
       );
-in {inherit pasteurize stir cure shake showAssertions beeOptions;}
+in {inherit pasteurize stir cure shake sing showAssertions beeOptions;}