refactor: small meta changes

hive.nix

@@ -17,7 +17,8 @@ let
     value = import ./machines/${name};
   }) (builtins.readDir ./machines);
 
-  meta' = evalModules {
+  meta =
+    (evalModules {
       modules = [
         ./kat/meta.nix
         { machines = mapAttrs (_: n: n.meta) nodes; }
@@ -25,10 +26,7 @@ let
       specialArgs = {
         inherit pkgs sources;
       };
-  };
-  meta = meta'.config // {
-    machines = mapAttrs (_: node: node.node_meta) meta'.config.machines;
-  };
+    }).config;
 
   meta-lib = self: rec {
     self-meta = meta.machines.${self};
@@ -38,11 +36,13 @@ let
         hubs = filterAttrs (_: node: node.vpn-hub) other-meta;
         non-hubs = filterAttrs (_: node: node.wg-key != null && !node.vpn-hub) other-meta;
         all-subnets =
-          [ "10.42.0.0/16" ] ++ flatten
-          (map (mapAttrsToList (_: node: node.subnets)) [
+          [ "10.42.0.0/16" ]
+          ++ flatten (
+            map (mapAttrsToList (_: node: node.subnets)) [
               hubs
               non-hubs
-          ]);
+            ]
+          );
       in
       if self-meta.vpn-hub then
         mapAttrsToList (_: node: {
@@ -69,7 +69,7 @@ in
       users = import ./users;
       kat-path = ./kat;
     };
-    nodeNixpkgs = mapAttrs (_: node: node.nixpkgs-paths.nixpkgs-src) meta.machines;
+    nodeNixpkgs = mapAttrs (_: node: node.nixpkgs) meta.machines;
     nodeSpecialArgs = mapAttrs (name: node: {
       self-meta = node;
       meta = meta // {

kat/default.nix

@@ -65,13 +65,12 @@ in
       };
       systemd.network.enable = true;
 
-      nixpkgs.overlays = import self-meta.nixpkgs-paths.overlays;
+      nixpkgs.overlays = import self-meta.nixpkgs-overlays;
       nix = {
         nixPath = [
-          "nixpkgs=${self-meta.nixpkgs-paths.nixpkgs}"
-          "nixos=${self-meta.nixpkgs-paths.nixpkgs}"
-          "nixpkgs-src=${self-meta.nixpkgs-paths.nixpkgs-src}"
-          "overlays=${self-meta.nixpkgs-paths.overlays}"
+          "nixpkgs=${self-meta.nixpkgs}"
+          "nixos=${self-meta.nixpkgs}"
+          "nixpkgs-overlays=${self-meta.nixpkgs-overlays}"
         ];
         channel.enable = false;
         settings = {

kat/meta.nix

@@ -7,6 +7,7 @@
 let
   inherit (lib)
     concatStringsSep
+    mapAttrs
     mkOption
     ;
   inherit (lib.types)
@@ -21,7 +22,8 @@ let
     unspecified
     ;
 
-  patched_lix = let
+  patched_lix =
+    let
       fetchTree-fix = pkgs.fetchurl {
         url = "https://gerrit.lix.systems/changes/lix~2399/revisions/1/patch?download";
         hash = "sha256-ecZOnpQmUYY2uSLwrt8QHkeLW+L5RZWVvi58h4GkGEY=";
@@ -31,7 +33,8 @@ let
           base64 -d $downloadedFile > $out
         '';
       };
-  in pkgs.applyPatches {
+    in
+    pkgs.applyPatches {
       src = sources.lix;
       name = "lix";
       patches = [
@@ -46,9 +49,7 @@ let
     '')
   ];
 
-  machine_meta =
-    { config, ... }:
-    {
+  machine_meta = {
     options = {
       version = mkOption {
         type = enum [
@@ -92,14 +93,10 @@ let
         type = nullOr str;
         default = null;
       };
-
-        node_meta = mkOption {
-          type = unspecified;
-          readOnly = true;
     };
   };
-      config.node_meta = rec {
-        inherit (config)
+  node_meta = cfg: rec {
+    inherit (cfg)
       version
       wg-key
       vpn-ip4
@@ -110,35 +107,27 @@ let
     patches = [
       ./nginx-fallback.patch
       ./ocamlPackagesExtentions.patch
-        ] ++ config.patches;
-        overlay-paths = default_overlay_paths ++ config.overlay-paths;
-        nixpkgs-paths = {
-          nixpkgs-src = pkgs.applyPatches {
+    ] ++ cfg.patches;
+    overlay-paths = default_overlay_paths ++ cfg.overlay-paths;
+    nixpkgs = pkgs.applyPatches {
       src = sources."nixpkgs-${version}";
       name = "nixpkgs-${version}-patched";
       inherit patches;
     };
-          nixpkgs = pkgs.writeText "nixpkgs-entry.nix" ''
-            { overlays ? [ ], ... }@args:
-            import ${nixpkgs-paths.nixpkgs-src} (args // {
-              overlays = import ${nixpkgs-paths.overlays} ++ overlays;
-            })
-          '';
-          overlays = pkgs.writeText "nixpkgs-overlays.nix" ''
+    nixpkgs-overlays = pkgs.writeText "nixpkgs-overlays.nix" ''
       [
         ${concatStringsSep "\n  " (map (p: "(import ${p})") overlay-paths)}
       ]
     '';
-        };
     home-manager = "${sources."home-manager-${version}"}/nixos";
     nixvim = import sources."nixvim-${version}";
   };
-    };
 in
 {
   options = {
     machines = mkOption {
       type = attrsOf (submodule machine_meta);
+      apply = mapAttrs (_: node_meta);
     };
     general_overlays = mkOption {
       type = listOf unspecified;