From 111d88a19397f694b1e78a6b61a0ad3d2081dd7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Thu, 1 May 2025 12:41:41 +0200
Subject: [PATCH] nilla: add inputs argument

---
 hosts/default.nix                        |  4 +---
 modules/default.nix                      |  2 +-
 modules/nilla/builders/nixpkgs-flake.nix |  4 ++--
 nilla.nix                                |  4 ++++
 pkgs/default.nix                         |  8 +++++---
 wrappers/default.nix                     | 12 ++++++++----
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/hosts/default.nix b/hosts/default.nix
index 843a8d1..5f8d069 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,9 +1,7 @@
 {
   config,
+  inputs,
 }:
-let
-  inputs = builtins.mapAttrs (_: input: input.result) config.inputs;
-in
 {
   includes = [
     ./kazuki
diff --git a/modules/default.nix b/modules/default.nix
index 2dc9115..867871e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,8 +1,8 @@
 {
   config,
+  inputs,
 }:
 let
-  inputs = builtins.mapAttrs (_: input: input.result) config.inputs;
   perInput = system: flake: {
     packages = flake.packages.${system};
   };
diff --git a/modules/nilla/builders/nixpkgs-flake.nix b/modules/nilla/builders/nixpkgs-flake.nix
index 4b0115f..e0dbcea 100644
--- a/modules/nilla/builders/nixpkgs-flake.nix
+++ b/modules/nilla/builders/nixpkgs-flake.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  inputs,
 }:
 {
   config.builders.nixpkgs-flake = {
@@ -14,8 +15,7 @@
     build =
       pkg:
       lib.attrs.generate pkg.systems (
-        system:
-        config.inputs.nixpkgs.result.legacyPackages.${system}.callPackage pkg.package pkg.settings.args
+        system: inputs.nixpkgs.legacyPackages.${system}.callPackage pkg.package pkg.settings.args
       );
   };
 }
diff --git a/nilla.nix b/nilla.nix
index 5562e23..5ba3acc 100644
--- a/nilla.nix
+++ b/nilla.nix
@@ -18,6 +18,10 @@
       inherit src;
       loader = "raw";
     }) inputs;
+    # Add inputs argument so modules can conveniently use it
+    config.__module__.args.dynamic.inputs = builtins.mapAttrs (
+      _name: input: input.result
+    ) config.inputs;
 
     config.packages =
       let
diff --git a/pkgs/default.nix b/pkgs/default.nix
index bd2f106..69c608f 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,4 +1,7 @@
-{ config }:
+{
+  config,
+  inputs,
+}:
 let
   systems = [
     "x86_64-linux"
@@ -9,14 +12,13 @@ let
   mkPackage = package: {
     inherit systems package builder;
   };
-
 in
 {
   config.packages.conduit-next = {
     inherit systems builder;
     package = import ./conduit;
     settings.args = {
-      src = config.inputs.conduit-src.result;
+      src = inputs.conduit-src;
     };
   };
 
diff --git a/wrappers/default.nix b/wrappers/default.nix
index 7701749..89fdb9f 100644
--- a/wrappers/default.nix
+++ b/wrappers/default.nix
@@ -1,4 +1,8 @@
-{ lib, config }:
+{
+  lib,
+  config,
+  inputs,
+}:
 let
   systems = [
     "x86_64-linux"
@@ -7,8 +11,8 @@ let
   ];
   wrappedPerSystem = lib.attrs.generate systems (
     system:
-    config.inputs.wrapper-manager-hm-compat.result.lib {
-      pkgs = config.inputs.nixpkgs.result.legacyPackages.${system};
+    inputs.wrapper-manager-hm-compat.lib {
+      pkgs = inputs.nixpkgs.legacyPackages.${system};
       modules = [
         ./starship
         ./helix
@@ -17,7 +21,7 @@ let
         ./fish
         ./wezterm
       ];
-      specialArgs.inputs = builtins.mapAttrs (_: input: input.result) config.inputs;
+      specialArgs = { inherit inputs; };
     }
   );
   wrappedPerSystem' = builtins.mapAttrs (_: wrapped: wrapped.config.build.packages) wrappedPerSystem;