foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-02-07 18:19:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

flake-parts/setups: properly initialize nixpkgs to be passed into module evaluation

Browse Source
This commit is contained in:
Gabriel Arazas 2024-07-12 13:05:32 +08:00
parent 8eb337cefc
commit c14a51aa9d
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/flake-parts/setups/home-manager.nix
View File

@ -15,7 +15,8 @@ let
, specialArgs ? { } , specialArgs ? { }
}: }:
let let
pkgs = inputs.${nixpkgsBranch}.legacyPackages.${system}; nixpkgs = inputs.${nixpkgsBranch};
pkgs = import nixpkgs { inherit system; };
in in
inputs.${homeManagerBranch}.lib.homeManagerConfiguration { inputs.${homeManagerBranch}.lib.homeManagerConfiguration {
extraSpecialArgs = specialArgs // { extraSpecialArgs = specialArgs // {

4
modules/flake-parts/setups/nixos.nix
View File

@ -18,13 +18,15 @@ let
nixpkgs = inputs.${nixpkgsBranch}; nixpkgs = inputs.${nixpkgsBranch};
# Just to be sure, we'll use everything with the given nixpkgs' stdlib. # Just to be sure, we'll use everything with the given nixpkgs' stdlib.
lib = nixpkgs.lib; pkgs = import nixpkgs { inherit system; };
lib = pkgs.lib;
# Evaluating the system ourselves (which is trivial) instead of relying # Evaluating the system ourselves (which is trivial) instead of relying
# on nixpkgs.lib.nixosSystem flake output. # on nixpkgs.lib.nixosSystem flake output.
nixosSystem = args: import "${nixpkgs}/nixos/lib/eval-config.nix" args; nixosSystem = args: import "${nixpkgs}/nixos/lib/eval-config.nix" args;
in in
(lib.makeOverridable nixosSystem) { (lib.makeOverridable nixosSystem) {
inherit pkgs;
specialArgs = specialArgs // { specialArgs = specialArgs // {
foodogsquaredUtils = import ../../../lib/utils/nixos.nix { inherit lib; }; foodogsquaredUtils = import ../../../lib/utils/nixos.nix { inherit lib; };
foodogsquaredModulesPath = builtins.toString nixosModules; foodogsquaredModulesPath = builtins.toString nixosModules;