Cleanups, ordering, cleaner diff

morph/lib/issuer.nix

@@ -60,6 +60,8 @@ in {
       domains = issuerDomains;
     };
 
+    services.private-storage.monitoring.exporters.node.enable = true;
+
     system.stateVersion = "19.03";
   };
 }

morph/lib/monitored-node.nix

@@ -24,7 +24,6 @@ in {
       };
     };
 
-    services.private-storage.monitoring.exporters.node.enable = true;
     services.private-storage.monitoring.vpn.client = {
       enable = true;
       ip = monitoringvpnIPv4;

morph/lib/storage.nix

@@ -44,6 +44,7 @@ in {
       };
     };
 
+    services.private-storage.monitoring.exporters.node.enable = true;
     services.private-storage.monitoring.exporters.tahoe.enable = true;
 
     # Turn on the Private Storage (Tahoe-LAFS) service.

nixos/modules/default.nix

@@ -10,12 +10,12 @@
   # configuration.  If PaymentServer hasn't been enabled then the
   # configuration will just be ignored.
   imports = [
+    ./packages.nix
     ./issuer.nix
+    ./private-storage.nix
+    ./monitoring/vpn/client.nix
     ./monitoring/exporters/node.nix
-    ./monitoring/exporters/promtail.nix
     ./monitoring/exporters/tahoe.nix
-    ./monitoring/vpn/client.nix
-    ./packages.nix
-    ./private-storage.nix
+    ./monitoring/exporters/promtail.nix
   ];
 }