diff --git a/lib/attrs/default.nix b/lib/attrs/default.nix index 9896757..c7a171f 100644 --- a/lib/attrs/default.nix +++ b/lib/attrs/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/default.nix b/lib/default.nix index ee1c6e8..05f0c3d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -6,6 +6,11 @@ core-inputs: user-options: 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; }; inherit (core-inputs.nixpkgs.lib) assertMsg fix filterAttrs mergeAttrs fold recursiveUpdate callPackageWith; @@ -60,7 +65,7 @@ let snowfall-lib = fix (snowfall-lib: let attrs = { - inherit snowfall-lib core-inputs user-inputs; + inherit snowfall-lib snowfall-config core-inputs user-inputs; }; libs = builtins.map (dir: import "${snowfall-lib-root}/${dir}" attrs) diff --git a/lib/flake/default.nix b/lib/flake/default.nix index 979b3e2..26909ae 100644 --- a/lib/flake/default.nix +++ b/lib/flake/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/fp/default.nix b/lib/fp/default.nix index 78da0ee..63e0826 100644 --- a/lib/fp/default.nix +++ b/lib/fp/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/fs/default.nix b/lib/fs/default.nix index 3791a81..54cbe64 100644 --- a/lib/fs/default.nix +++ b/lib/fs/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let @@ -31,7 +32,7 @@ in # Type: Path -> Path # Usage: get-snowfall-file "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. # Type: Path -> Path diff --git a/lib/home/default.nix b/lib/home/default.nix index 6a56fb8..c2ea41b 100644 --- a/lib/home/default.nix +++ b/lib/home/default.nix @@ -1,4 +1,8 @@ -{ core-inputs, user-inputs, snowfall-lib }: +{ core-inputs +, user-inputs +, snowfall-lib +, snowfall-config +}: let inherit (core-inputs.nixpkgs.lib) diff --git a/lib/internal/default.nix b/lib/internal/default.nix index dfa4a78..40aa8b3 100644 --- a/lib/internal/default.nix +++ b/lib/internal/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/module/default.nix b/lib/module/default.nix index 7b647cb..6ef087a 100644 --- a/lib/module/default.nix +++ b/lib/module/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/overlay/default.nix b/lib/overlay/default.nix index cc8dccd..be2ea5d 100644 --- a/lib/overlay/default.nix +++ b/lib/overlay/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/package/default.nix b/lib/package/default.nix index 3968ecd..b77b51c 100644 --- a/lib/package/default.nix +++ b/lib/package/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/path/default.nix b/lib/path/default.nix index 216f194..602f42f 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/shell/default.nix b/lib/shell/default.nix index aecd0e2..4eb5aec 100644 --- a/lib/shell/default.nix +++ b/lib/shell/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/system/default.nix b/lib/system/default.nix index cccf5c5..6d9bfa5 100644 --- a/lib/system/default.nix +++ b/lib/system/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let diff --git a/lib/template/default.nix b/lib/template/default.nix index 3e04626..6527c3a 100644 --- a/lib/template/default.nix +++ b/lib/template/default.nix @@ -1,6 +1,7 @@ { core-inputs , user-inputs , snowfall-lib +, snowfall-config }: let