Changes to nutmeg and flake.nix

lib/hosts.nix

@@ -1,24 +0,0 @@
-{ lib, ... }:
-
-with lib;
-let
-  hostname-from-file = filename: builtins.replaceStrings [".nix"] [""] filename;
-
-  is-nix-file = filename: type: (builtins.match ".+\.nix$" filename) != null;
-  is-regular-file = filename: type: type == "regular" || type == "link";
-
-  host-files = host-path:
-    attrNames
-      (filterAttrs is-nix-file
-        (filterAttrs is-regular-file
-          (builtins.readDir host-path)));
-
-  hosts = host-path:
-    map hostname-from-file (host-files host-path);
-in {
-  base-host-config = host-path: let
-    load-host-file = hostname: import (host-path + "/${hostname}.nix");
-  in genAttrs (hosts host-path) (hostname: load-host-file hostname);
-
-  host-list = host-path: hosts host-path;
-}

lib/system.nix

@@ -0,0 +1,36 @@
+{ lib, ... }:
+
+with lib;
+let
+  head-or-null = lst: if (lst == []) then null else head lst;
+  is-regular-file = filename: type: type == "regular" || type == "link";
+  regular-files = path: filterAttrs is-regular-file (builtins.readDir path);
+  matches-ext = ext: filename: type: (builtins.match ".+[.]${ext}$" filename) != null;
+  is-nix-file = matches-ext "nix";
+  strip-ext = ext: filename: head-or-null (builtins.match "(.+)[.]${ext}$" filename);
+  get-ext = filename: head-or-null (builtins.match "^.+[.](.+)$" filename);
+  hostname-from-file = filename: strip-ext "nix";
+  nix-files = path:
+    attrNames
+      (filterAttrs is-nix-file
+        (filterAttrs is-regular-file
+          (builtins.readDir path)));
+
+  basename-to-file = path: let
+    files = nix-files path;
+  in listToAttrs
+    (map (file:
+      nameValuePair (strip-ext "nix" file)
+        (path + "/${file}"))
+      files);
+
+  basename-import = path:
+    mapAttrs (attr: attr-file: import attr-file)
+      (basename-to-file path);
+
+in {
+
+  hosts = host-path: basename-import host-path;
+
+  networks = network-path: basename-import network-path;
+}