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; }; }; };