From cdbf0a0df79c67d00b19ffdbc9fdfc3904e5805c Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Sun, 16 Feb 2025 11:52:39 +0100 Subject: [PATCH] home-manager: fix missing inputs.self some options in nvf module uses inputs.self but it's not exposed in the inputs we pass to home-manager module: example flake.nix: ``` { inputs = { /* ... */ }; outputs = {nixpkgs, ...}@inputs: { testing = { a = inputs.self # valid b = inputs.self.inputs # valid c = inputs.self.inputs.self # does not exist # prior to this change, inputs.self.inputs was passed to the hm # module, which lacks the self attr # # This change passes in the "top-level" inputs instead. }; }; } ``` --- flake.nix | 2 +- flake/modules/home-manager.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index acef6382..7175b0d4 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,7 @@ }; homeManagerModules = { - nvf = import ./flake/modules/home-manager.nix {inherit lib self;}; + nvf = import ./flake/modules/home-manager.nix {inherit lib inputs;}; default = self.homeManagerModules.nvf; neovim-flake = lib.warn '' diff --git a/flake/modules/home-manager.nix b/flake/modules/home-manager.nix index 715f7537..3b75e49a 100644 --- a/flake/modules/home-manager.nix +++ b/flake/modules/home-manager.nix @@ -1,13 +1,13 @@ # Home Manager module { - self, + inputs, lib, }: { config, pkgs, ... }: let - inherit (self) packages inputs; + inherit (inputs.self) packages; inherit (lib) maintainers; inherit (lib.modules) mkIf mkAliasOptionModule; inherit (lib.lists) optional; @@ -19,7 +19,7 @@ nvfModule = submoduleWith { description = "Nvf module"; class = "nvf"; - specialArgs = { + specialArgs = lib.trace (builtins.attrNames inputs) { inherit pkgs lib inputs; }; modules = import ../../modules/modules.nix {inherit pkgs lib;};