flake.nix

@@ -19,14 +19,6 @@
       generateNixosSystem = name: nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          ({ ... }: {
-            /*
-              Make the contents of the flake availiable to modules.
-              Useful for having the monitoring server scraping the
-              target config from all other servers automatically.
-            */
-            _module.args._nixfiles = self;
-          })
           ./configuration/common
           ({ ... }: {
             nixpkgs.overlays = [

hosts/mail-1/configuration.nix

@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  networking.hostName = "mail-1";
+
+  clerie.monitoring = {
+    enable = true;
+    id = "208";
+    pubkey = "s2GT9iYQmuiwkZ04KzSqqlIEbUJ6CT6i4htCjWYt2xs=";
+    nixos = false;
+  };
+}

hosts/monitoring-3/prometheus.nix

@@ -1,19 +1,9 @@
-{ config, pkgs, lib, _nixfiles, ... }:
+{ config, pkgs, lib, ... }:
 
 with lib;
 
 let
-  hosts = _nixfiles.nixosConfigurations // {
+  hosts = (import ../../lib/hosts.nix { inherit pkgs; }).hosts;
-    "mail-1".config = {
-      networking.hostName = "mail-1";
-      clerie.monitoring = {
-        enable = true;
-        id = "208";
-        pubkey = "s2GT9iYQmuiwkZ04KzSqqlIEbUJ6CT6i4htCjWYt2xs=";
-        nixos = false;
-      };
-    };
-  };
 
   monitoringHosts = filterAttrs (name: host:
     attrByPath ["clerie" "monitoring" "enable"] false host.config)

lib/hosts.nix

@@ -0,0 +1,26 @@
+{ pkgs ? import ../pkgs {} }:
+
+with pkgs.lib;
+
+rec {
+  hostsDir = ../hosts;
+
+  hostNames = attrNames (
+    filterAttrs (
+      name: type: type == "directory"
+    ) (
+      builtins.readDir hostsDir
+    )
+  );
+
+  hosts = listToAttrs (
+    map (
+      hostName: nameValuePair hostName (
+        import (pkgs.path + "/nixos") {
+          configuration = import (hostsDir + "/${hostName}/configuration.nix");
+          system = "x86_64-linux";
+        }
+      )
+    ) hostNames
+  );
+}