4 files changed, 22 insertions, 28 deletions
diff --git a/hosts/eden/default.nix b/hosts/eden/default.nix
index c7604da..bb39dbe 100644
--- a/hosts/eden/default.nix
+++ b/hosts/eden/default.nix
@@ -38,7 +38,16 @@
     zfs.extraPools = [ "tank" ];
   };
 
-  motd = {
+  services.zquota = {
+    enable = true;
+    quotas = {
+      "tank/backups" = 512;
+      "tank/media" = 1536;
+    };
+  };
+
+  programs.motd = {
+    enable = true;
     networkInterfaces = lib.lists.singleton "eno1";
     servicesToCheck = [
       "caddy"
@@ -49,12 +58,4 @@
       "zfs-zed"
     ];
   };
-
-  services.zquota = {
-    enable = true;
-    quotas = {
-      "tank/backups" = 512;
-      "tank/media" = 1536;
-    };
-  };
 }
diff --git a/hosts/hive/default.nix b/hosts/hive/default.nix
index c164b92..61b8193 100644
--- a/hosts/hive/default.nix
+++ b/hosts/hive/default.nix
@@ -34,11 +34,9 @@
     efi.canTouchEfiVariables = true;
   };
 
-  motd = {
+  programs.motd = {
+    enable = true;
     networkInterfaces = lib.lists.singleton "eno1";
-    servicesToCheck = [
-      "caddy"
-      "gotosocial"
-    ];
+    servicesToCheck = [ "caddy" "gotosocial" ];
   };
 }
diff --git a/hosts/oasis/default.nix b/hosts/oasis/default.nix
index 5b849fb..5b8ebb3 100644
--- a/hosts/oasis/default.nix
+++ b/hosts/oasis/default.nix
@@ -38,19 +38,16 @@
     zfs.extraPools = [ "tank" ];
   };
 
-  motd = {
-    networkInterfaces = lib.lists.singleton "enp59s0";
-    servicesToCheck = [
-      "caddy"
-      "sftpgo"
-      "zfs-zed"
-    ];
-  };
-
   services.zquota = {
     enable = true;
     quotas = { "tank/sftpgo" = 512; };
   };
 
   services.sftpgo.dataDir = "/tank/sftpgo";
+
+  programs.motd = {
+    enable = true;
+    networkInterfaces = lib.lists.singleton "enp59s0";
+    servicesToCheck = [ "caddy" "sftpgo" "zfs-zed" ];
+  };
 }
diff --git a/hosts/raindog/default.nix b/hosts/raindog/default.nix
index 0eb2d30..ac66068 100644
--- a/hosts/raindog/default.nix
+++ b/hosts/raindog/default.nix
@@ -34,11 +34,9 @@
     efi.canTouchEfiVariables = true;
   };
 
-  motd = {
+  programs.motd = {
+    enable = true;
     networkInterfaces = lib.lists.singleton "eno1";
-    servicesToCheck = [
-      "blocky"
-      "searx"
-    ];
+    servicesToCheck = [ "blocky" "searx" ];
   };
 }