From e61e184925eb8617183cd51c3f70d160f26aa341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 15 Sep 2023 22:47:28 +0200
Subject: [PATCH] server9: format

---
 hosts/server9/default.nix | 47 ++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/hosts/server9/default.nix b/hosts/server9/default.nix
index e859057d..75d807fe 100644
--- a/hosts/server9/default.nix
+++ b/hosts/server9/default.nix
@@ -55,30 +55,35 @@
 
   sops = {
     defaultSopsFile = ./secrets.yaml;
-    secrets."machine-id" = {
-      mode = "444";
-      path = "/etc/machine-id";
+    secrets = {
+      "machine-id" = {
+        mode = "444";
+        path = "/etc/machine-id";
+      };
+      "ceph/osd.3/keyfile" = { };
+      "ceph/osd.7/keyfile" = { };
     };
-    secrets."ceph/osd.3/keyfile" = {};
-    secrets."ceph/osd.7/keyfile" = {};
   };
 
-  skyflake.nomad.client.meta."c3d2.cpuSpeed" = "3";
-  skyflake.storage.ceph.osds = [ {
-    id = 3;
-    fsid = "54d56ab8-fc43-4e16-886d-3c82dcc1f8fe";
-    path = "/dev/zvol/tank/ceph-osd.3";
-    keyfile = config.sops.secrets."ceph/osd.3/keyfile".path;
-    deviceClass = "hdd";
-  } {
-    id = 7;
-    fsid = "a5450c3b-2e20-450b-a17a-d7938ee9d262";
-    path = "/dev/disk/by-id/wwn-0x600300570140a0c02c39f0863bd3c53e";
-    keyfile = config.sops.secrets."ceph/osd.7/keyfile".path;
-    deviceClass = "ssd";
-  } ];
-  # TODO: remove
-  skyflake.storage.ceph.package = lib.mkForce pkgs.ceph_17_2;
+  skyflake = {
+    nomad.client.meta."c3d2.cpuSpeed" = "3";
+    storage.ceph.osds = [{
+      id = 3;
+      fsid = "54d56ab8-fc43-4e16-886d-3c82dcc1f8fe";
+      path = "/dev/zvol/tank/ceph-osd.3";
+      keyfile = config.sops.secrets."ceph/osd.3/keyfile".path;
+      deviceClass = "hdd";
+    }
+      {
+        id = 7;
+        fsid = "a5450c3b-2e20-450b-a17a-d7938ee9d262";
+        path = "/dev/disk/by-id/wwn-0x600300570140a0c02c39f0863bd3c53e";
+        keyfile = config.sops.secrets."ceph/osd.7/keyfile".path;
+        deviceClass = "ssd";
+      }];
+    # TODO: remove
+    storage.ceph.package = lib.mkForce pkgs.ceph_17_2;
+  };
 
   system.stateVersion = "21.11";