major: grand unified clusterfck (ekman not tested yet)

2025-09-12 13:12:36 +02:00
parent e0846164a7 ba5f1b8add
commit 5c72112457
97 changed files with 3704 additions and 8 deletions
--- a/rossby/c0/default.nix
+++ b/rossby/c0/default.nix
@@ -35,7 +35,11 @@ let

  mkCompute = host:
  let
+<<<<<<<< HEAD:rossby/c0/default.nix
    hw = ./hardware-config.d + "/${host.name}.nix";
+========
+    hw = ./hardware-configuration.d + "/${host.name}.nix";
+>>>>>>>> ekman:ekman/c0/default.nix
  in {
    "${host.name}" = {
      cluster = {