expose self and inputs to lib and hosts

flake.nix

@@ -36,7 +36,7 @@
 
       extern = import ./extern { inherit inputs; };
 
-      pkgs' = os.mkPkgs { inherit self; };
+      pkgs' = os.mkPkgs;
 
       outputs =
         let
@@ -46,7 +46,7 @@
         {
           nixosConfigurations =
             import ./hosts (nixos.lib.recursiveUpdate inputs {
-              inherit pkgs system extern;
+              inherit pkgs system extern inputs;
               inherit (pkgs) lib;
             });
 
@@ -57,7 +57,7 @@
           overlay = import ./pkgs;
           overlays = lib.pathsToImportedAttrs (lib.pathsIn ./overlays);
 
-          lib = import ./lib { inherit nixos pkgs; };
+          lib = import ./lib (inputs // { inherit nixos pkgs self; });
 
           templates.flk.path = ./.;
           templates.flk.description = "flk template";
@@ -79,16 +79,14 @@
         let pkgs = pkgs'.${system}; in
         {
           packages = utils.lib.flattenTreeSystem system
-            (os.mkPackages {
-              inherit self pkgs;
-            });
+            (os.mkPackages { inherit pkgs; });
 
           devShell = import ./shell {
             inherit self system;
           };
 
           legacyPackages.hmActivationPackages =
-            os.mkHomeActivation { inherit self; };
+            os.mkHomeActivation;
         }
       );
     in

hosts/default.nix

@@ -6,6 +6,7 @@
 , pkgs
 , self
 , system
+, inputs
 , ...
 }:
 let
@@ -42,11 +43,6 @@ let
 
         nixpkgs = { inherit pkgs; };
 
-        _module.args = {
-          hosts = builtins.mapAttrs (_: host: host.config)
-            (removeAttrs hosts [ config.networking.hostName ]);
-        };
-
         nix.registry = {
           devos.flake = self;
           nixos.flake = nixos;
@@ -67,7 +63,7 @@ let
       modOverrides
     ] ++ extern.modules;
 
-  specialArgs = extern.specialArgs // { inherit suites; };
+  specialArgs = extern.specialArgs // { inherit suites inputs; };
 
   mkHostConfig = hostName:
     let
@@ -77,6 +73,12 @@ let
         ];
 
         networking = { inherit hostName; };
+
+        _module.args = {
+          inherit self;
+          hosts = builtins.mapAttrs (_: host: host.config)
+            (removeAttrs hosts [ hostName ]);
+        };
       };
     in
     dev.os.devosSystem {

lib/default.nix

@@ -1,4 +1,4 @@
-args@{ nixos, pkgs, ... }:
+args@{ nixos, pkgs, self, ... }:
 let inherit (nixos) lib; in
 lib.makeExtensible (self:
   let callLibs = file: import file

lib/devos/mkHomeActivation.nix

@@ -1,6 +1,5 @@
-{ lib, ... }:
+{ lib, self, ... }:
 
-{ self }:
 let hmConfigs =
   lib.mapAttrs
     (_: config: config.config.home-manager.users)

lib/devos/mkPackages.nix

@@ -1,6 +1,6 @@
-{ lib, dev, ... }:
+{ lib, dev, self, ... }:
 
-{ self, pkgs }:
+{ pkgs }:
 let
   inherit (self) overlay overlays;
   packagesNames = lib.attrNames (overlay null null)

lib/devos/mkPkgs.nix

@@ -1,6 +1,5 @@
-{ lib, dev, nixos, ... }:
+{ lib, dev, nixos, self, ... }:
 
-{ self }:
 let inherit (self) inputs;
 in
 (inputs.utils.lib.eachDefaultSystem

shell/default.nix

@@ -2,7 +2,7 @@
 , system ? builtins.currentSystem
 }:
 let
-  pkgs = (self.lib.os.mkPkgs { inherit self; }).${system};
+  pkgs = (self.lib.os.mkPkgs).${system};
 
   inherit (pkgs) lib;