diff --git a/modules/flake-parts/setups/home-manager.nix b/modules/flake-parts/setups/home-manager.nix index 617d5fb0..2a5fcc87 100644 --- a/modules/flake-parts/setups/home-manager.nix +++ b/modules/flake-parts/setups/home-manager.nix @@ -12,12 +12,13 @@ let , nixpkgsBranch ? "nixpkgs" , homeManagerBranch ? "home-manager" , extraModules ? [ ] + , specialArgs ? { } }: let pkgs = inputs.${nixpkgsBranch}.legacyPackages.${system}; in inputs.${homeManagerBranch}.lib.homeManagerConfiguration { - extraSpecialArgs = { + extraSpecialArgs = specialArgs // { foodogsquaredModulesPath = builtins.toString homeManagerModules; }; diff --git a/modules/flake-parts/setups/nixos.nix b/modules/flake-parts/setups/nixos.nix index f9e73cdc..e58e553a 100644 --- a/modules/flake-parts/setups/nixos.nix +++ b/modules/flake-parts/setups/nixos.nix @@ -13,7 +13,7 @@ let partsConfig = config; # A thin wrapper around the NixOS configuration function. - mkHost = { extraModules ? [ ], nixpkgsBranch ? "nixpkgs", system }: + mkHost = { system ,extraModules ? [ ], nixpkgsBranch ? "nixpkgs", specialArgs ? { } }: let nixpkgs = inputs.${nixpkgsBranch}; @@ -25,7 +25,7 @@ let nixosSystem = args: import "${nixpkgs}/nixos/lib/eval-config.nix" args; in (lib.makeOverridable nixosSystem) { - specialArgs = { + specialArgs = specialArgs // { foodogsquaredUtils = import ../../../lib/utils/nixos.nix { inherit lib; }; foodogsquaredModulesPath = builtins.toString nixosModules; }; diff --git a/modules/flake-parts/setups/nixvim.nix b/modules/flake-parts/setups/nixvim.nix index 28ecf6c8..93e78e3f 100644 --- a/modules/flake-parts/setups/nixvim.nix +++ b/modules/flake-parts/setups/nixvim.nix @@ -9,13 +9,19 @@ let cfg = config.setups.nixvim; nixvimModules = ../../nixvim; - mkNixvimConfig = { system, pkgs, nixvimBranch ? "nixvim", modules ? [ ] }: + mkNixvimConfig = { + system, + pkgs, + nixvimBranch ? "nixvim", + modules ? [ ], + specialArgs ? { }, + }: inputs.${nixvimBranch}.legacyPackages.${system}.makeNixvimWithModule { inherit pkgs; module = { imports = modules; }; - extraSpecialArgs = { + extraSpecialArgs = specialArgs // { foodogsquaredModulesPath = builtins.toString nixvimModules; }; };