From 3d456b1a4383d2f40cceb691182c4364333fe934 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Sun, 22 Sep 2024 22:46:56 +0200
Subject: [PATCH] Make machines' nixos module an attrset

---
 machines/lewis.nix   | 18 ++++++++----------
 machines/warwick.nix | 14 ++++++--------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/machines/lewis.nix b/machines/lewis.nix
index 5350142..c20bbb2 100644
--- a/machines/lewis.nix
+++ b/machines/lewis.nix
@@ -6,17 +6,15 @@
       hasMedia = "true";
     };
 
-    nixosModule = {
-      lab = {
-        storage.profile = "kubernetes";
-        backups.enable = true;
-        data-sharing.enable = true;
-        tailscale.enable = true;
+    nixosModule.lab = {
+      storage.profile = "kubernetes";
+      backups.enable = true;
+      data-sharing.enable = true;
+      tailscale.enable = true;
 
-        k3s = {
-          enable = true;
-          serverAddr = "https://jefke.dmz:6443";
-        };
+      k3s = {
+        enable = true;
+        serverAddr = "https://jefke.dmz:6443";
       };
     };
   };
diff --git a/machines/warwick.nix b/machines/warwick.nix
index f000881..15e276d 100644
--- a/machines/warwick.nix
+++ b/machines/warwick.nix
@@ -3,15 +3,13 @@
     arch = "aarch64-linux";
     isRaspberryPi = true;
 
-    nixosModule = { lib, ... }: {
-      lab = {
-        storage.profile = "pi";
-        monitoring.server.enable = true;
+    nixosModule.lab = {
+      storage.profile = "pi";
+      monitoring.server.enable = true;
 
-        tailscale = {
-          advertiseExitNode = true;
-          enable = true;
-        };
+      tailscale = {
+        advertiseExitNode = true;
+        enable = true;
       };
     };
   };