fix: pass snowfall-config through to modules

This commit is contained in:
Jake Hamilton 2023-07-01 17:44:12 -07:00
parent 7d7546913d
commit 66e1335803
No known key found for this signature in database
GPG key ID: 9762169A1B35EA68
14 changed files with 24 additions and 3 deletions

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -6,6 +6,11 @@ core-inputs:
user-options: user-options:
let let
raw-snowfall-config = user-options.snowfall or { };
snowfall-config = raw-snowfall-config // {
root = raw-snowfall-config.root or user-options.src;
};
user-inputs = user-options.inputs // { src = user-options.src; }; user-inputs = user-options.inputs // { src = user-options.src; };
inherit (core-inputs.nixpkgs.lib) assertMsg fix filterAttrs mergeAttrs fold recursiveUpdate callPackageWith; inherit (core-inputs.nixpkgs.lib) assertMsg fix filterAttrs mergeAttrs fold recursiveUpdate callPackageWith;
@ -60,7 +65,7 @@ let
snowfall-lib = fix (snowfall-lib: snowfall-lib = fix (snowfall-lib:
let let
attrs = { attrs = {
inherit snowfall-lib core-inputs user-inputs; inherit snowfall-lib snowfall-config core-inputs user-inputs;
}; };
libs = builtins.map libs = builtins.map
(dir: import "${snowfall-lib-root}/${dir}" attrs) (dir: import "${snowfall-lib-root}/${dir}" attrs)

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let
@ -31,7 +32,7 @@ in
# Type: Path -> Path # Type: Path -> Path
# Usage: get-snowfall-file "systems" # Usage: get-snowfall-file "systems"
# result: "/user-source/snowfall-dir/systems" # result: "/user-source/snowfall-dir/systems"
get-snowfall-file = path: "${user-inputs.snowfall.root or user-inputs.src}/${path}"; get-snowfall-file = path: "${snowfall-config.root}/${path}";
# Get a file path relative to the this flake. # Get a file path relative to the this flake.
# Type: Path -> Path # Type: Path -> Path

View file

@ -1,4 +1,8 @@
{ core-inputs, user-inputs, snowfall-lib }: { core-inputs
, user-inputs
, snowfall-lib
, snowfall-config
}:
let let
inherit (core-inputs.nixpkgs.lib) inherit (core-inputs.nixpkgs.lib)

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let

View file

@ -1,6 +1,7 @@
{ core-inputs { core-inputs
, user-inputs , user-inputs
, snowfall-lib , snowfall-lib
, snowfall-config
}: }:
let let