fix: partially fix a totally botched merge.

2025-09-12 14:32:42 +02:00
parent c8814ec8d9
commit fcd136ed4e
21 changed files with 2 additions and 73 deletions
--- a/rossby/c0/default.nix
+++ b/rossby/c0/default.nix
@@ -35,11 +35,7 @@ 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 = {
--- a/rossby/c0/hardware-configuration.d/c0-10.nix
+++ b/rossby/c0/hardware-configuration.d/c0-10.nix
--- a/rossby/c0/hardware-configuration.d/c0-11.nix
+++ b/rossby/c0/hardware-configuration.d/c0-11.nix
--- a/rossby/c0/hardware-configuration.d/c0-13.nix
+++ b/rossby/c0/hardware-configuration.d/c0-13.nix
--- a/rossby/c0/hardware-configuration.d/c0-14.nix
+++ b/rossby/c0/hardware-configuration.d/c0-14.nix
--- a/rossby/c0/hardware-configuration.d/c0-15.nix
+++ b/rossby/c0/hardware-configuration.d/c0-15.nix
--- a/rossby/c0/hardware-configuration.d/c0-16.nix
+++ b/rossby/c0/hardware-configuration.d/c0-16.nix
--- a/rossby/c0/hardware-configuration.d/c0-17.nix
+++ b/rossby/c0/hardware-configuration.d/c0-17.nix
--- a/rossby/c0/hardware-configuration.d/c0-18.nix
+++ b/rossby/c0/hardware-configuration.d/c0-18.nix
--- a/rossby/c0/hardware-configuration.d/c0-19.nix
+++ b/rossby/c0/hardware-configuration.d/c0-19.nix
--- a/rossby/c0/hardware-configuration.d/c0-2.nix
+++ b/rossby/c0/hardware-configuration.d/c0-2.nix
--- a/rossby/c0/hardware-configuration.d/c0-20.nix
+++ b/rossby/c0/hardware-configuration.d/c0-20.nix
--- a/rossby/c0/hardware-configuration.d/c0-3.nix
+++ b/rossby/c0/hardware-configuration.d/c0-3.nix
--- a/rossby/c0/hardware-configuration.d/c0-4.nix
+++ b/rossby/c0/hardware-configuration.d/c0-4.nix
--- a/rossby/c0/hardware-configuration.d/c0-5.nix
+++ b/rossby/c0/hardware-configuration.d/c0-5.nix
--- a/rossby/c0/hardware-configuration.d/c0-6.nix
+++ b/rossby/c0/hardware-configuration.d/c0-6.nix
--- a/rossby/c0/hardware-configuration.d/c0-8.nix
+++ b/rossby/c0/hardware-configuration.d/c0-8.nix
--- a/rossby/c0/hardware-configuration.d/c0-9.nix
+++ b/rossby/c0/hardware-configuration.d/c0-9.nix