moved zfs services to global/default.nix

common/global/default.nix

@@ -42,7 +42,17 @@
     };
   };
 
-  services.fwupd.enable = true;
+  services = {
+    # firmware update
+    fwupd.enable = true;
+
+    snapshot_manager.enable = lib.mkDefault true;
+
+    zfs = {
+      trim.enable = lib.mkDefault true;
+      autoScrub.enable = lib.mkDefault true;
+    };
+  };
 
   programs.zsh.enable = true;
 

systems/bob/default.nix

@@ -31,7 +31,6 @@
     };
   };
 
-
   services = {
     displayManager = {
       enable = true;
@@ -43,13 +42,6 @@
     };
 
     openssh.ports = [ 262 ];
-
-    snapshot_manager.enable = true;
-
-    zfs = {
-      trim.enable = true;
-      autoScrub.enable = true;
-    };
   };
 
   system.stateVersion = "24.05";

systems/jeeves/default.nix

@@ -37,17 +37,7 @@ in
 
     smartd.enable = true;
 
-    snapshot_manager = {
+    snapshot_manager.path = ./snapshot_config.toml;
-      enable = true;
-      path = ./snapshot_config.toml;
-    };
-
-    sysstat.enable = true;
-
-    zfs = {
-      trim.enable = true;
-      autoScrub.enable = true;
-    };
   };
 
   system.stateVersion = "24.05";

systems/rhapsody-in-green/default.nix

@@ -29,18 +29,7 @@
     };
   };
 
-
+  services.openssh.ports = [ 922 ];
-  services = {
-
-    openssh.ports = [ 922 ];
-
-    snapshot_manager.enable = true;
-
-    zfs = {
-      trim.enable = true;
-      autoScrub.enable = true;
-    };
-  };
 
   system.stateVersion = "24.05";
 }