save

flake.nix

@@ -3,7 +3,8 @@
 
   inputs = {
     utils.url = "github:kreisys/flake-utils";
-    cli.url = "github:input-output-hk/bitte-cli/decalisssystemd";
+    cli.url = "github:input-output-hk/bitte-cli";
+    nix.url = "github:NixOS/nix/4e9cec79bf5302108a031b3910f63baccf719eb5";
 
     ops-lib = {
       url = "github:input-output-hk/ops-lib";
@@ -16,7 +17,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, terranix, utils, cli, ... }:
+  outputs = { self, nix, nixpkgs, terranix, utils, cli, ... }:
   (utils.lib.simpleFlake {
       inherit nixpkgs;
       name = "bitte";
@@ -26,6 +27,8 @@
         cli
         ./overlay.nix
         (final: prev: {
+          inherit (nix.packages.${final.system}) nix;
+          nixFlakes = final.nix;
           lib = nixpkgs.lib.extend (final: prev: {
             terranix = import (terranix + "/core");
           });
@@ -51,7 +54,6 @@
       || throw "unfree not allowed: ${name}";
 
     }) // {
-      mkHashiStack = import ./lib/mk-hashi-stack.nix;
       lib = import ./lib { inherit nixpkgs; };
       nixosModules = self.lib.importNixosModules ./modules;
     };

lib/clusters.nix

@@ -21,7 +21,10 @@ rec {
         ../profiles/consul/policies.nix
         file
       ];
-      specialArgs = { inherit self deployerPkgs; };
+      specialArgs = {
+        inherit self deployerPkgs;
+        inherit (self.inputs) bitte;
+      };
     };
 
   mkCluster = self: deployerPkgs: file:
@@ -69,11 +72,14 @@ rec {
         ../modules
         (nixpkgs + "/nixos/modules/virtualisation/amazon-image.nix")
       ] ++ modules;
-      specialArgs = { inherit nodeName self deployerPkgs; };
+      specialArgs = {
+        inherit nodeName self deployerPkgs;
+        inherit (self.inputs) bitte;
+      };
     };
 
   mkClusters =
-    { self, nixpkgs, system, root }:
+    { self, system, root }:
     let
       inherit (builtins) attrNames readDir mapAttrs;
       inherit (nixpkgs.lib)

lib/default.nix

@@ -12,6 +12,8 @@ let
     {
       inherit nixpkgs;
       clusters = callLibs ./clusters.nix;
+      net = callLibs ./net.nix;
+      mkHashiStack = callLibs ./mk-hashi-stack.nix;
       inherit (self.clusters) mkCluster mkClusters;
 
       mkNixosConfigurations = clusters: