hive.nix

@@ -50,9 +50,12 @@ let
   mkArgs = node:
     let lib' = (mkNixpkgs' node).lib;
     in {
-      lib = import sources.nix-lib {
-        lib = lib';
-        keysRoot = ./keys;
+      lib = lib' // {
+        extra = import sources.nix-lib {
+          lib = lib';
+          keysRoot = ./keys;
+          metaRoot = ./meta;
+        };
       };
     };
 

lib/default.nix

@@ -3,11 +3,12 @@ _:
 let
   sources = import ../npins;
 
-  nix-lib = (import sources.nix-lib {
+  nix-lib = import sources.nix-lib {
     inherit ((import sources.nixpkgs { })) lib;
 
     keysRoot = ../keys;
-  }).extra;
+    metaRoot = ../meta;
+  };
 
 in nix-lib // (with nix-lib; {
   # Get publickeys associated to a node

machines/compute01/_configuration.nix

@@ -30,8 +30,6 @@ lib.extra.mkConfig {
     ];
 
     dgn-hardware.useZfs = true;
-
-    services.netbird.enable = true;
   };
 
   root = ./.;

machines/storage01/_configuration.nix

@@ -17,8 +17,6 @@ lib.extra.mkConfig {
 
   extraConfig = {
     dgn-hardware.useZfs = true;
-
-    services.netbird.enable = true;
   };
 
   root = ./.;

machines/web01/_configuration.nix

@@ -16,9 +16,5 @@ lib.extra.mkConfig {
     "wordpress"
   ];
 
-  extraConfig = {
-    services.netbird.enable = true;
-  };
-
   root = ./.;
 }

npins/sources.json

@@ -84,10 +84,10 @@
       },
       "pre_releases": false,
       "version_upper_bound": null,
-      "version": "0.1.6",
-      "revision": "ffb3dfa4c146d48300bd4fa625acfe48e091a734",
+      "version": "0.1.5",
+      "revision": "5260bfd4e8aaffef455bfa0edf3d0a2db81de989",
       "url": null,
-      "hash": "1frsja071qqx6p7rjnijzhidqfylx0ipzqpmjdvj4jl89h34vrhr"
+      "hash": "18c9mcjx1v4zlgl91dgiq4rrcayz05fy8v5pq00dlyfm3chrqvxx"
     },
     "nix-patches": {
       "type": "GitRelease",