Moving config stuff from ./lib into ./config

flake.nix

@@ -6,49 +6,48 @@
 
     fudo-home.url = "path:/state/nixops/fudo-home";
 
+    fudo-entities.url = "path:/state/fudo-entities";
+
+    fudo-lib.url = "path:/state/fudo-lib";
+
     fudo-pkgs.url = "path:/state/nixops/fudo-pkgs";
 
     fudo-secrets.url = "path:/state/secrets";
   };
 
-  outputs = { self, nixpkgs, fudo-home, fudo-pkgs, fudo-secrets, ... }:
+  outputs = { self,
+              nixpkgs,
+              fudo-home,
+              fudo-lib,
+              fudo-entities,
+              fudo-pkgs,
+              fudo-secrets,
+              ... }:
     with nixpkgs.lib;
     let
       sys-lib = import ./lib/system.nix { lib = nixpkgs.lib; };
 
-      fudo-nix-hosts = nixpkgs.lib.filterAttrs
+      fudo-nix-hosts = filterAttrs
         (hostname: hostOpts: hostOpts.nixos-system)
-        (sys-lib.hosts ./config/hosts);
+        (fudo-entities.entities.hosts);
 
-      fudo-networks = sys-lib.networks ./config/networks;
-    in {
-      fudoHosts = fudo-nix-hosts;
+      fudo-networks = fudo-entities.entities.networks;
 
-      fudoNetworks = fudo-networks;
-
-      nixosModule = {
-        imports = [
-          ./lib
-        ];
-      };
-
-      nixosConfigurations = let
-
-        build-timestamp = self.sourceInfo.lastModified;
-
-        pkgs-for = arch: import nixpkgs {
-          system = arch;
-          config = {
-            allowUnfree = true;
-            permittedInsecurePackages = [
-              "openssh-with-gssapi-8.4p1"
-            ];
-          };
-          overlays = [
-            fudo-pkgs.overlay
-            (import ./lib/overlay.nix)
+      pkgs-for = arch: import nixpkgs {
+        system = arch;
+        config = {
+          allowUnfree = true;
+          permittedInsecurePackages = [
+            "openssh-with-gssapi-8.4p1"
           ];
         };
+        overlays = [
+          fudo-lib.overlay
+          fudo-pkgs.overlay
+        ];
+      };
+    in {
+      nixosConfigurations = let
       in mapAttrs (hostname: hostOpts: let
         system = hostOpts.arch;
         site = hostOpts.site;
@@ -62,15 +61,13 @@
         in [
           fudo-home.nixosModule
           fudo-secrets.nixosModule
+          fudo-lib.nixosModule
 
           ({ config, ... }: let
             network-hosts = config.fudo.networks.${domain}.hosts;
-            host-filesystem-keys =
-              config.fudo.secrets.files.host-filesystem-keys;
           in {
             imports = [
-              ./lib
-              ./config
+              fudo-entities.nixosModule
               (config-path + /hardware/${hostname}.nix)
               (config-path + /host-config/${hostname}.nix)
               (config-path + /profile-config/${profile}.nix)
@@ -78,23 +75,11 @@
               (config-path + /site-config/${site}.nix)
             ];
             instance = {
-              inherit hostname build-timestamp;
+              inherit hostname;
               build-seed = builtins.readFile
                 config.fudo.secrets.files.build-seed;
             };
             nixpkgs.pkgs = pkgs-for system;
-            # deployment = {
-            #   targetHost =
-            #     network-hosts.${hostname}.ipv4-address;
-
-            #   keys = if (hasAttr hostname host-filesystem-keys) then
-            #     mapAttrs (secret: secret-file: {
-            #       keyFile = secret-file;
-            #       user = "root";
-            #       permissions = "0400";
-            #     }) host-filesystem-keys.${hostname}
-            #   else {};
-            # };
           })
         ];
       }) fudo-nix-hosts;